diff --git a/src/main/java/com/casic/accessControl/feature/domain/Feature.java b/src/main/java/com/casic/accessControl/feature/domain/Feature.java
deleted file mode 100644
index c89a0c2..0000000
--- a/src/main/java/com/casic/accessControl/feature/domain/Feature.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.casic.accessControl.feature.domain;
-
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-
-import javax.persistence.*;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-//点的信息
-@Entity
-@Table(name = "feature")
-public class Feature {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private Long id;
-    @Column(name = "longitude")
-    private Double longitude;
-    @Column(name = "latitude")
-    private Double latitude;
-    @Column(name = "featureName")
-    private String featureName;
-    @Column(name = "type")
-    private int type;
-    @Column(name = "isValid")
-    private Integer isValid;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "parent")
-    private Feature parent;
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "parent")
-    private List<Feature> children;
-    @Column(name = "memo")
-    private String memo;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "owner", referencedColumnName = "id")
-    private User owner;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "company", referencedColumnName = "id")
-    private Company company;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer isValid() {
-        return isValid;
-    }
-
-    public void setValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public Feature getParent() {
-        return parent;
-    }
-
-    public void setParent(Feature parent) {
-        this.parent = parent;
-    }
-
-    public List<Feature> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<Feature> children) {
-        this.children = children;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public User getOwner() {
-        return owner;
-    }
-
-    public void setOwner(User owner) {
-        this.owner = owner;
-    }
-
-    public Company getCompany() {
-        return company;
-    }
-
-    public void setCompany(Company company) {
-        this.company = company;
-    }
-}

diff --git a/src/main/java/com/casic/accessControl/feature/domain/Feature.java b/src/main/java/com/casic/accessControl/feature/domain/Feature.java
deleted file mode 100644
index c89a0c2..0000000
--- a/src/main/java/com/casic/accessControl/feature/domain/Feature.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.casic.accessControl.feature.domain;
-
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-
-import javax.persistence.*;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-//点的信息
-@Entity
-@Table(name = "feature")
-public class Feature {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private Long id;
-    @Column(name = "longitude")
-    private Double longitude;
-    @Column(name = "latitude")
-    private Double latitude;
-    @Column(name = "featureName")
-    private String featureName;
-    @Column(name = "type")
-    private int type;
-    @Column(name = "isValid")
-    private Integer isValid;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "parent")
-    private Feature parent;
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "parent")
-    private List<Feature> children;
-    @Column(name = "memo")
-    private String memo;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "owner", referencedColumnName = "id")
-    private User owner;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "company", referencedColumnName = "id")
-    private Company company;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer isValid() {
-        return isValid;
-    }
-
-    public void setValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public Feature getParent() {
-        return parent;
-    }
-
-    public void setParent(Feature parent) {
-        this.parent = parent;
-    }
-
-    public List<Feature> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<Feature> children) {
-        this.children = children;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public User getOwner() {
-        return owner;
-    }
-
-    public void setOwner(User owner) {
-        this.owner = owner;
-    }
-
-    public Company getCompany() {
-        return company;
-    }
-
-    public void setCompany(Company company) {
-        this.company = company;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java b/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
deleted file mode 100644
index 256f261..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import com.casic.accessControl.feature.domain.Feature;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/17.
- */
-public class FeatureDto {
-    private Long id;
-    private Double longitude;
-    private Double latitude;
-    private String featureName;
-    private int type;
-    private Integer isValid;
-    private String memo;
-    private Long parentId;
-
-    private String btnEdit = "<a href='#' class='btn mini blue'><i class='icon-edit'></i>编辑</a>";
-    private String btnDelete = "<a href='#' class='btn mini red'><i class='icon-trash'></i>删除</a>";
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer getIsValid() {
-        return isValid;
-    }
-
-    public void setIsValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public Long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getBtnEdit() {
-        return btnEdit;
-    }
-
-    public void setBtnEdit(String btnEdit) {
-        this.btnEdit = btnEdit;
-    }
-
-    public String getBtnDelete() {
-        return btnDelete;
-    }
-
-    public void setBtnDelete(String btnDelete) {
-        this.btnDelete = btnDelete;
-    }
-
-    public static FeatureDto convert2FeatureDto(Feature feature) {
-        if (feature == null) {
-            return null;
-        }
-        FeatureDto featureDto = new FeatureDto();
-        featureDto.setId(feature.getId());
-        featureDto.setFeatureName(feature.getFeatureName());
-        featureDto.setIsValid(feature.isValid());
-        featureDto.setLatitude(feature.getLatitude());
-        featureDto.setLongitude(feature.getLongitude());
-        featureDto.setMemo(feature.getMemo());
-        featureDto.setType(feature.getType());
-        if (feature.getParent() != null)
-            featureDto.setParentId(feature.getParent().getId());
-        return featureDto;
-    }
-
-    public static List<FeatureDto> convert2FeatureDtos(List<Feature> features) {
-        List<FeatureDto> featureDtos = new ArrayList<FeatureDto>();
-        for (Feature feature : features) {
-            featureDtos.add(convert2FeatureDto(feature));
-        }
-        return featureDtos;
-    }
-}

diff --git a/src/main/java/com/casic/accessControl/feature/domain/Feature.java b/src/main/java/com/casic/accessControl/feature/domain/Feature.java
deleted file mode 100644
index c89a0c2..0000000
--- a/src/main/java/com/casic/accessControl/feature/domain/Feature.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.casic.accessControl.feature.domain;
-
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-
-import javax.persistence.*;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-//点的信息
-@Entity
-@Table(name = "feature")
-public class Feature {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private Long id;
-    @Column(name = "longitude")
-    private Double longitude;
-    @Column(name = "latitude")
-    private Double latitude;
-    @Column(name = "featureName")
-    private String featureName;
-    @Column(name = "type")
-    private int type;
-    @Column(name = "isValid")
-    private Integer isValid;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "parent")
-    private Feature parent;
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "parent")
-    private List<Feature> children;
-    @Column(name = "memo")
-    private String memo;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "owner", referencedColumnName = "id")
-    private User owner;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "company", referencedColumnName = "id")
-    private Company company;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer isValid() {
-        return isValid;
-    }
-
-    public void setValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public Feature getParent() {
-        return parent;
-    }
-
-    public void setParent(Feature parent) {
-        this.parent = parent;
-    }
-
-    public List<Feature> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<Feature> children) {
-        this.children = children;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public User getOwner() {
-        return owner;
-    }
-
-    public void setOwner(User owner) {
-        this.owner = owner;
-    }
-
-    public Company getCompany() {
-        return company;
-    }
-
-    public void setCompany(Company company) {
-        this.company = company;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java b/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
deleted file mode 100644
index 256f261..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import com.casic.accessControl.feature.domain.Feature;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/17.
- */
-public class FeatureDto {
-    private Long id;
-    private Double longitude;
-    private Double latitude;
-    private String featureName;
-    private int type;
-    private Integer isValid;
-    private String memo;
-    private Long parentId;
-
-    private String btnEdit = "<a href='#' class='btn mini blue'><i class='icon-edit'></i>编辑</a>";
-    private String btnDelete = "<a href='#' class='btn mini red'><i class='icon-trash'></i>删除</a>";
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer getIsValid() {
-        return isValid;
-    }
-
-    public void setIsValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public Long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getBtnEdit() {
-        return btnEdit;
-    }
-
-    public void setBtnEdit(String btnEdit) {
-        this.btnEdit = btnEdit;
-    }
-
-    public String getBtnDelete() {
-        return btnDelete;
-    }
-
-    public void setBtnDelete(String btnDelete) {
-        this.btnDelete = btnDelete;
-    }
-
-    public static FeatureDto convert2FeatureDto(Feature feature) {
-        if (feature == null) {
-            return null;
-        }
-        FeatureDto featureDto = new FeatureDto();
-        featureDto.setId(feature.getId());
-        featureDto.setFeatureName(feature.getFeatureName());
-        featureDto.setIsValid(feature.isValid());
-        featureDto.setLatitude(feature.getLatitude());
-        featureDto.setLongitude(feature.getLongitude());
-        featureDto.setMemo(feature.getMemo());
-        featureDto.setType(feature.getType());
-        if (feature.getParent() != null)
-            featureDto.setParentId(feature.getParent().getId());
-        return featureDto;
-    }
-
-    public static List<FeatureDto> convert2FeatureDtos(List<Feature> features) {
-        List<FeatureDto> featureDtos = new ArrayList<FeatureDto>();
-        for (Feature feature : features) {
-            featureDtos.add(convert2FeatureDto(feature));
-        }
-        return featureDtos;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java b/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
deleted file mode 100644
index 785dcba..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/19.
- */
-public class OrgDto {
-    private long id;
-
-    private String name;
-
-    private long parentId;
-
-    private List<OrgDto> children = new ArrayList<OrgDto>();
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(long parentId) {
-        this.parentId = parentId;
-    }
-
-    public List<OrgDto> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<OrgDto> children) {
-        this.children = children;
-    }
-}

diff --git a/src/main/java/com/casic/accessControl/feature/domain/Feature.java b/src/main/java/com/casic/accessControl/feature/domain/Feature.java
deleted file mode 100644
index c89a0c2..0000000
--- a/src/main/java/com/casic/accessControl/feature/domain/Feature.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.casic.accessControl.feature.domain;
-
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-
-import javax.persistence.*;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-//点的信息
-@Entity
-@Table(name = "feature")
-public class Feature {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private Long id;
-    @Column(name = "longitude")
-    private Double longitude;
-    @Column(name = "latitude")
-    private Double latitude;
-    @Column(name = "featureName")
-    private String featureName;
-    @Column(name = "type")
-    private int type;
-    @Column(name = "isValid")
-    private Integer isValid;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "parent")
-    private Feature parent;
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "parent")
-    private List<Feature> children;
-    @Column(name = "memo")
-    private String memo;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "owner", referencedColumnName = "id")
-    private User owner;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "company", referencedColumnName = "id")
-    private Company company;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer isValid() {
-        return isValid;
-    }
-
-    public void setValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public Feature getParent() {
-        return parent;
-    }
-
-    public void setParent(Feature parent) {
-        this.parent = parent;
-    }
-
-    public List<Feature> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<Feature> children) {
-        this.children = children;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public User getOwner() {
-        return owner;
-    }
-
-    public void setOwner(User owner) {
-        this.owner = owner;
-    }
-
-    public Company getCompany() {
-        return company;
-    }
-
-    public void setCompany(Company company) {
-        this.company = company;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java b/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
deleted file mode 100644
index 256f261..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import com.casic.accessControl.feature.domain.Feature;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/17.
- */
-public class FeatureDto {
-    private Long id;
-    private Double longitude;
-    private Double latitude;
-    private String featureName;
-    private int type;
-    private Integer isValid;
-    private String memo;
-    private Long parentId;
-
-    private String btnEdit = "<a href='#' class='btn mini blue'><i class='icon-edit'></i>编辑</a>";
-    private String btnDelete = "<a href='#' class='btn mini red'><i class='icon-trash'></i>删除</a>";
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer getIsValid() {
-        return isValid;
-    }
-
-    public void setIsValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public Long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getBtnEdit() {
-        return btnEdit;
-    }
-
-    public void setBtnEdit(String btnEdit) {
-        this.btnEdit = btnEdit;
-    }
-
-    public String getBtnDelete() {
-        return btnDelete;
-    }
-
-    public void setBtnDelete(String btnDelete) {
-        this.btnDelete = btnDelete;
-    }
-
-    public static FeatureDto convert2FeatureDto(Feature feature) {
-        if (feature == null) {
-            return null;
-        }
-        FeatureDto featureDto = new FeatureDto();
-        featureDto.setId(feature.getId());
-        featureDto.setFeatureName(feature.getFeatureName());
-        featureDto.setIsValid(feature.isValid());
-        featureDto.setLatitude(feature.getLatitude());
-        featureDto.setLongitude(feature.getLongitude());
-        featureDto.setMemo(feature.getMemo());
-        featureDto.setType(feature.getType());
-        if (feature.getParent() != null)
-            featureDto.setParentId(feature.getParent().getId());
-        return featureDto;
-    }
-
-    public static List<FeatureDto> convert2FeatureDtos(List<Feature> features) {
-        List<FeatureDto> featureDtos = new ArrayList<FeatureDto>();
-        for (Feature feature : features) {
-            featureDtos.add(convert2FeatureDto(feature));
-        }
-        return featureDtos;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java b/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
deleted file mode 100644
index 785dcba..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/19.
- */
-public class OrgDto {
-    private long id;
-
-    private String name;
-
-    private long parentId;
-
-    private List<OrgDto> children = new ArrayList<OrgDto>();
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(long parentId) {
-        this.parentId = parentId;
-    }
-
-    public List<OrgDto> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<OrgDto> children) {
-        this.children = children;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java b/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
deleted file mode 100644
index a475e21..0000000
--- a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
+++ /dev/null
@@ -1,316 +0,0 @@
-package com.casic.accessControl.feature.manager;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.core.page.Page;
-import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.marker.manager.MarkerManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.DataTableParameter;
-import com.casic.accessControl.util.DataTableUtils;
-import org.apache.commons.collections.CollectionUtils;
-import org.hibernate.Criteria;
-import org.hibernate.Query;
-import org.hibernate.criterion.Restrictions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.jdbc.object.SqlQuery;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-@Service
-public class FeatureManager extends HibernateEntityDao<Feature> {
-
-    private Logger logger = LoggerFactory.getLogger(this.getClass());
-    @Resource
-    private MarkerManager markerManager;
-
-
-    public Feature getFeatureById(Long id) {
-        Feature feature = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("id", id)).add(Restrictions.eq("isValid", 1));
-            feature = (Feature) criteria.list().get(0);
-        } catch (Exception e) {
-            return null;
-        }
-        return feature;
-    }
-
-    public FeatureDto getFeatureDtoById(Long id) {
-        return FeatureDto.convert2FeatureDto(getFeatureById(id));
-    }
-
-    /**
-     * 根据id，软删除某个点或线或片
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param ids 多个id
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public String invalidFeature(String ids) {
-        if (StringUtils.isBlank(ids) || ids.indexOf(")") != -1) {//未传入值，直接返回，防止无效查询,过滤非法请求，防止sql注入
-            return "";
-        }
-        String[] idsArr = ids.split(",");
-        StringBuilder canDeleteIds = new StringBuilder("");
-        StringBuilder cantDeleleIds = new StringBuilder("");
-        //找出能删除的和不能删除的id组合
-        for (String id : idsArr) {
-            Long longId = Long.valueOf(id);
-            if (this.isCanDelete(longId)) {
-                if (canDeleteIds.length() > 0) {
-                    canDeleteIds.append(",");
-                }
-                canDeleteIds.append(id);
-
-            } else {
-                if (cantDeleleIds.length() > 0) {
-                    cantDeleleIds.append(",");
-                }
-                cantDeleleIds.append(id);
-            }
-        }
-
-        String temp1Ids = canDeleteIds.toString();
-        String temp2Ids = cantDeleleIds.toString();
-        if (StringUtils.isNotBlank(temp2Ids)) {//有不能删除的，都不删除
-            return "";
-        }
-        Query query = this.getSession().createQuery("update Feature f set f.isValid = 0 where id in (" + temp1Ids + ")");
-        query.executeUpdate();
-
-        return "success";
-    }
-
-    /**
-     * 判断feature是否可以删除
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param id
-     * @return
-     */
-    private boolean isCanDelete(Long id) {
-        Feature feature = this.getFeatureById(id);
-        if (feature.getParent() == null) {//所有用户共用的根节点不能删除
-            return false;
-        }
-        if (CollectionUtils.isNotEmpty(feature.getChildren())) {
-            for (Feature child : feature.getChildren()) {
-                if (child.isValid() == 1) {
-                    return false;
-                }
-            }
-
-        }
-        List<Marker> markers = markerManager.getMarkerByFeature(feature);
-        if (CollectionUtils.isNotEmpty(markers)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * 将数据库中的feature信息按照参数更新
-     *
-     * @param feature
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public void saveOrupdateFeature(Feature feature, User user) {
-        this.getSession().saveOrUpdate(feature);
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param user 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByUser")
-    public List<FeatureDto> getFeaturesByUser(Integer type, User user) {
-        if (user == null) {
-            return Collections.emptyList();
-        }
-        Company company = user.getCompany();
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("type", type));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-        return FeatureDto.convert2FeatureDtos(features);
-    }
-
-    /**
-     * 分页使用，datatable获取相应type的feature某页数据
-     *
-     * @param params
-     * @param user
-     * @return
-     */
-    public DataTable<FeatureDto> getPageFeatureListByTye(String params, Feature parent, User user) {
-        DataTable<FeatureDto> result = new DataTable<FeatureDto>();
-        DataTableParameter parameter = DataTableUtils.getDataTableParameterByJsonParam(params);
-        int start = parameter.getiDisplayStart();
-        int pageSize = parameter.getiDisplayLength();
-        int pageNo = (start / pageSize) + 1;
-        Criteria criteria = this.createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        Company company = user.getCompany();
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("isValid", 1)).add(Restrictions.eq("parent", parent));
-        Page page = pagedQuery(criteria, pageNo, pageSize);
-        List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos((List<Feature>) page.getResult());
-        result.setAaData(featureDtos);
-        result.setiTotalDisplayRecords((int) page.getTotalCount());
-        result.setiTotalRecords((int) page.getTotalCount());
-        result.setsEcho(parameter.getsEcho());
-        return result;
-
-
-    }
-
-    /**
-     * 获取层次结构列表,增加缓存
-     *
-     * @param type
-     * @param company
-     * @return
-     */
-    @Cacheable(value = "getOrgList")
-    public String getOrgList(Integer type, Company company) {
-        List<OrgDto> orgDtos = new ArrayList<OrgDto>();
-        List<Feature> features = this.getRootFeatures(type);
-        for (Feature feature : features) {
-            orgDtos.add(this.getChildrenByParentId(feature.getId(), company));
-        }
-        String jsonStr = null;
-        try {
-            jsonStr = new JsonMapper().toJson(orgDtos);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return jsonStr;
-    }
-
-    //    @Cacheable(value = "getChildrenByParentId", key = "#id")
-    public OrgDto getChildrenByParentId(Long id, Company company) {
-        if (id == null) {
-            return null;
-        }
-        Feature feature = getFeatureById(id);
-        if (feature == null) {
-            return null;
-        }
-        //创建OrgDto节点
-        OrgDto orgDto = new OrgDto();
-        orgDto.setId(id); //保存ID信息
-        orgDto.setName(feature.getFeatureName());
-        if (feature.getParent() != null) {
-            orgDto.setParentId(feature.getParent().getId());
-        }
-        List<Feature> departments = this.getActiveChildrenOrgs(feature, company);
-        for (Feature fea : departments) {
-            orgDto.getChildren().add(this.getChildrenByParentId(fea.getId(), company));
-        }
-        return orgDto;
-    }
-
-    //    @Cacheable(value = "getActiveChildrenOrgs", key = "#department.getId()")
-    private List<Feature> getActiveChildrenOrgs(Feature department, Company company) {
-        List<Feature> features = new ArrayList<Feature>();
-        for (Feature feature : department.getChildren()) {
-            if (feature.isValid() == 1 && feature.getCompany().getId().equals(company.getId())) {
-                features.add(feature);
-            }
-        }
-        return features;
-    }
-
-
-    public List<Feature> getRootFeatures(Integer type) {
-        List<Feature> features = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("type", type)).add(Restrictions.isNull("parent"));
-            features = criteria.list();
-        } catch (Exception e) {
-            return Collections.emptyList();
-        }
-        return features;
-
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param company 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByCompany", key = "#company.getId()")
-    public List<Feature> getFeaturesByCompany(Company company) {
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-        criteria.add(Restrictions.eq("company", company));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-
-        for (Feature f : features) {
-            f.getChildren().toString();
-            f.getOwner().toString();
-            if (f.getParent() != null)
-                f.getParent().toString();
-        }
-        return features;
-    }
-
-    /**
-     * 根据组织结构的id获取叶子节点
-     ***重要：**已更改为包含本节点****
-     * @param type
-     * @param feature
-     * @return
-     */
-    public List<Feature> getLeafByParentId(Integer type, Feature feature) {
-        if (feature == null || feature.isValid() == 0) return Collections.emptyList();
-        List<Feature> features = new ArrayList<Feature>();
-        if (CollectionUtils.isEmpty(feature.getChildren())) {
-            features.add(feature);
-            return features;
-        }
-        List<Feature> children = feature.getChildren();
-        boolean flag = false;
-        for (Feature child : children) {
-            if (child.isValid() == 1) {
-                flag = true;
-                features.addAll(getLeafByParentId(type, child));
-            }
-        }
-//        if (!flag) {//没有有效的子节点
-            features.add(feature);
-//        }
-        return features;
-    }
-
-}

diff --git a/src/main/java/com/casic/accessControl/feature/domain/Feature.java b/src/main/java/com/casic/accessControl/feature/domain/Feature.java
deleted file mode 100644
index c89a0c2..0000000
--- a/src/main/java/com/casic/accessControl/feature/domain/Feature.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.casic.accessControl.feature.domain;
-
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-
-import javax.persistence.*;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-//点的信息
-@Entity
-@Table(name = "feature")
-public class Feature {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private Long id;
-    @Column(name = "longitude")
-    private Double longitude;
-    @Column(name = "latitude")
-    private Double latitude;
-    @Column(name = "featureName")
-    private String featureName;
-    @Column(name = "type")
-    private int type;
-    @Column(name = "isValid")
-    private Integer isValid;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "parent")
-    private Feature parent;
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "parent")
-    private List<Feature> children;
-    @Column(name = "memo")
-    private String memo;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "owner", referencedColumnName = "id")
-    private User owner;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "company", referencedColumnName = "id")
-    private Company company;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer isValid() {
-        return isValid;
-    }
-
-    public void setValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public Feature getParent() {
-        return parent;
-    }
-
-    public void setParent(Feature parent) {
-        this.parent = parent;
-    }
-
-    public List<Feature> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<Feature> children) {
-        this.children = children;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public User getOwner() {
-        return owner;
-    }
-
-    public void setOwner(User owner) {
-        this.owner = owner;
-    }
-
-    public Company getCompany() {
-        return company;
-    }
-
-    public void setCompany(Company company) {
-        this.company = company;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java b/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
deleted file mode 100644
index 256f261..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import com.casic.accessControl.feature.domain.Feature;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/17.
- */
-public class FeatureDto {
-    private Long id;
-    private Double longitude;
-    private Double latitude;
-    private String featureName;
-    private int type;
-    private Integer isValid;
-    private String memo;
-    private Long parentId;
-
-    private String btnEdit = "<a href='#' class='btn mini blue'><i class='icon-edit'></i>编辑</a>";
-    private String btnDelete = "<a href='#' class='btn mini red'><i class='icon-trash'></i>删除</a>";
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer getIsValid() {
-        return isValid;
-    }
-
-    public void setIsValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public Long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getBtnEdit() {
-        return btnEdit;
-    }
-
-    public void setBtnEdit(String btnEdit) {
-        this.btnEdit = btnEdit;
-    }
-
-    public String getBtnDelete() {
-        return btnDelete;
-    }
-
-    public void setBtnDelete(String btnDelete) {
-        this.btnDelete = btnDelete;
-    }
-
-    public static FeatureDto convert2FeatureDto(Feature feature) {
-        if (feature == null) {
-            return null;
-        }
-        FeatureDto featureDto = new FeatureDto();
-        featureDto.setId(feature.getId());
-        featureDto.setFeatureName(feature.getFeatureName());
-        featureDto.setIsValid(feature.isValid());
-        featureDto.setLatitude(feature.getLatitude());
-        featureDto.setLongitude(feature.getLongitude());
-        featureDto.setMemo(feature.getMemo());
-        featureDto.setType(feature.getType());
-        if (feature.getParent() != null)
-            featureDto.setParentId(feature.getParent().getId());
-        return featureDto;
-    }
-
-    public static List<FeatureDto> convert2FeatureDtos(List<Feature> features) {
-        List<FeatureDto> featureDtos = new ArrayList<FeatureDto>();
-        for (Feature feature : features) {
-            featureDtos.add(convert2FeatureDto(feature));
-        }
-        return featureDtos;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java b/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
deleted file mode 100644
index 785dcba..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/19.
- */
-public class OrgDto {
-    private long id;
-
-    private String name;
-
-    private long parentId;
-
-    private List<OrgDto> children = new ArrayList<OrgDto>();
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(long parentId) {
-        this.parentId = parentId;
-    }
-
-    public List<OrgDto> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<OrgDto> children) {
-        this.children = children;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java b/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
deleted file mode 100644
index a475e21..0000000
--- a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
+++ /dev/null
@@ -1,316 +0,0 @@
-package com.casic.accessControl.feature.manager;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.core.page.Page;
-import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.marker.manager.MarkerManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.DataTableParameter;
-import com.casic.accessControl.util.DataTableUtils;
-import org.apache.commons.collections.CollectionUtils;
-import org.hibernate.Criteria;
-import org.hibernate.Query;
-import org.hibernate.criterion.Restrictions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.jdbc.object.SqlQuery;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-@Service
-public class FeatureManager extends HibernateEntityDao<Feature> {
-
-    private Logger logger = LoggerFactory.getLogger(this.getClass());
-    @Resource
-    private MarkerManager markerManager;
-
-
-    public Feature getFeatureById(Long id) {
-        Feature feature = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("id", id)).add(Restrictions.eq("isValid", 1));
-            feature = (Feature) criteria.list().get(0);
-        } catch (Exception e) {
-            return null;
-        }
-        return feature;
-    }
-
-    public FeatureDto getFeatureDtoById(Long id) {
-        return FeatureDto.convert2FeatureDto(getFeatureById(id));
-    }
-
-    /**
-     * 根据id，软删除某个点或线或片
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param ids 多个id
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public String invalidFeature(String ids) {
-        if (StringUtils.isBlank(ids) || ids.indexOf(")") != -1) {//未传入值，直接返回，防止无效查询,过滤非法请求，防止sql注入
-            return "";
-        }
-        String[] idsArr = ids.split(",");
-        StringBuilder canDeleteIds = new StringBuilder("");
-        StringBuilder cantDeleleIds = new StringBuilder("");
-        //找出能删除的和不能删除的id组合
-        for (String id : idsArr) {
-            Long longId = Long.valueOf(id);
-            if (this.isCanDelete(longId)) {
-                if (canDeleteIds.length() > 0) {
-                    canDeleteIds.append(",");
-                }
-                canDeleteIds.append(id);
-
-            } else {
-                if (cantDeleleIds.length() > 0) {
-                    cantDeleleIds.append(",");
-                }
-                cantDeleleIds.append(id);
-            }
-        }
-
-        String temp1Ids = canDeleteIds.toString();
-        String temp2Ids = cantDeleleIds.toString();
-        if (StringUtils.isNotBlank(temp2Ids)) {//有不能删除的，都不删除
-            return "";
-        }
-        Query query = this.getSession().createQuery("update Feature f set f.isValid = 0 where id in (" + temp1Ids + ")");
-        query.executeUpdate();
-
-        return "success";
-    }
-
-    /**
-     * 判断feature是否可以删除
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param id
-     * @return
-     */
-    private boolean isCanDelete(Long id) {
-        Feature feature = this.getFeatureById(id);
-        if (feature.getParent() == null) {//所有用户共用的根节点不能删除
-            return false;
-        }
-        if (CollectionUtils.isNotEmpty(feature.getChildren())) {
-            for (Feature child : feature.getChildren()) {
-                if (child.isValid() == 1) {
-                    return false;
-                }
-            }
-
-        }
-        List<Marker> markers = markerManager.getMarkerByFeature(feature);
-        if (CollectionUtils.isNotEmpty(markers)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * 将数据库中的feature信息按照参数更新
-     *
-     * @param feature
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public void saveOrupdateFeature(Feature feature, User user) {
-        this.getSession().saveOrUpdate(feature);
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param user 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByUser")
-    public List<FeatureDto> getFeaturesByUser(Integer type, User user) {
-        if (user == null) {
-            return Collections.emptyList();
-        }
-        Company company = user.getCompany();
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("type", type));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-        return FeatureDto.convert2FeatureDtos(features);
-    }
-
-    /**
-     * 分页使用，datatable获取相应type的feature某页数据
-     *
-     * @param params
-     * @param user
-     * @return
-     */
-    public DataTable<FeatureDto> getPageFeatureListByTye(String params, Feature parent, User user) {
-        DataTable<FeatureDto> result = new DataTable<FeatureDto>();
-        DataTableParameter parameter = DataTableUtils.getDataTableParameterByJsonParam(params);
-        int start = parameter.getiDisplayStart();
-        int pageSize = parameter.getiDisplayLength();
-        int pageNo = (start / pageSize) + 1;
-        Criteria criteria = this.createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        Company company = user.getCompany();
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("isValid", 1)).add(Restrictions.eq("parent", parent));
-        Page page = pagedQuery(criteria, pageNo, pageSize);
-        List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos((List<Feature>) page.getResult());
-        result.setAaData(featureDtos);
-        result.setiTotalDisplayRecords((int) page.getTotalCount());
-        result.setiTotalRecords((int) page.getTotalCount());
-        result.setsEcho(parameter.getsEcho());
-        return result;
-
-
-    }
-
-    /**
-     * 获取层次结构列表,增加缓存
-     *
-     * @param type
-     * @param company
-     * @return
-     */
-    @Cacheable(value = "getOrgList")
-    public String getOrgList(Integer type, Company company) {
-        List<OrgDto> orgDtos = new ArrayList<OrgDto>();
-        List<Feature> features = this.getRootFeatures(type);
-        for (Feature feature : features) {
-            orgDtos.add(this.getChildrenByParentId(feature.getId(), company));
-        }
-        String jsonStr = null;
-        try {
-            jsonStr = new JsonMapper().toJson(orgDtos);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return jsonStr;
-    }
-
-    //    @Cacheable(value = "getChildrenByParentId", key = "#id")
-    public OrgDto getChildrenByParentId(Long id, Company company) {
-        if (id == null) {
-            return null;
-        }
-        Feature feature = getFeatureById(id);
-        if (feature == null) {
-            return null;
-        }
-        //创建OrgDto节点
-        OrgDto orgDto = new OrgDto();
-        orgDto.setId(id); //保存ID信息
-        orgDto.setName(feature.getFeatureName());
-        if (feature.getParent() != null) {
-            orgDto.setParentId(feature.getParent().getId());
-        }
-        List<Feature> departments = this.getActiveChildrenOrgs(feature, company);
-        for (Feature fea : departments) {
-            orgDto.getChildren().add(this.getChildrenByParentId(fea.getId(), company));
-        }
-        return orgDto;
-    }
-
-    //    @Cacheable(value = "getActiveChildrenOrgs", key = "#department.getId()")
-    private List<Feature> getActiveChildrenOrgs(Feature department, Company company) {
-        List<Feature> features = new ArrayList<Feature>();
-        for (Feature feature : department.getChildren()) {
-            if (feature.isValid() == 1 && feature.getCompany().getId().equals(company.getId())) {
-                features.add(feature);
-            }
-        }
-        return features;
-    }
-
-
-    public List<Feature> getRootFeatures(Integer type) {
-        List<Feature> features = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("type", type)).add(Restrictions.isNull("parent"));
-            features = criteria.list();
-        } catch (Exception e) {
-            return Collections.emptyList();
-        }
-        return features;
-
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param company 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByCompany", key = "#company.getId()")
-    public List<Feature> getFeaturesByCompany(Company company) {
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-        criteria.add(Restrictions.eq("company", company));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-
-        for (Feature f : features) {
-            f.getChildren().toString();
-            f.getOwner().toString();
-            if (f.getParent() != null)
-                f.getParent().toString();
-        }
-        return features;
-    }
-
-    /**
-     * 根据组织结构的id获取叶子节点
-     ***重要：**已更改为包含本节点****
-     * @param type
-     * @param feature
-     * @return
-     */
-    public List<Feature> getLeafByParentId(Integer type, Feature feature) {
-        if (feature == null || feature.isValid() == 0) return Collections.emptyList();
-        List<Feature> features = new ArrayList<Feature>();
-        if (CollectionUtils.isEmpty(feature.getChildren())) {
-            features.add(feature);
-            return features;
-        }
-        List<Feature> children = feature.getChildren();
-        boolean flag = false;
-        for (Feature child : children) {
-            if (child.isValid() == 1) {
-                flag = true;
-                features.addAll(getLeafByParentId(type, child));
-            }
-        }
-//        if (!flag) {//没有有效的子节点
-            features.add(feature);
-//        }
-        return features;
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java b/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
deleted file mode 100644
index a706a36..0000000
--- a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package com.casic.accessControl.feature.web;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.Role;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.CompanyManager;
-import com.casic.accessControl.user.manager.UserManager;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.StringUtils;
-import com.casic.accessControl.xls.Common;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import sun.org.mozilla.javascript.internal.EcmaError;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.IOException;
-import java.util.*;
-
-/**
- * 提供http访问接口
- * Created by lenovo on 2016/5/16.
- */
-@Controller
-@RequestMapping(value = "feature")
-public class FeatureController {
-    @Autowired
-    private FeatureManager featureManager;
-    @Autowired
-    private UserManager userManager;
-    @Autowired
-    private CompanyManager companyManager;
-
-    @RequestMapping(value = "org-list")
-    @ResponseBody
-    public String getOrgList(@RequestParam(required = true) Integer type, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Company company = user.getCompany();
-        return featureManager.getOrgList(type, company);
-    }
-
-    @RequestMapping(value = "org-list-na")
-    @ResponseBody
-    public Map<String, String> getOrgListNa(@RequestParam Long userId) {//na端所有传过来的userid都是公司id
-        Map<String, String> res = new HashMap<String, String>();
-        res.put("message", "列表获取失败");
-        try {
-//            User user = userManager.getUserById(userId);//获取当前登录用户
-//            Company company = user.getCompany();
-            Company company = companyManager.getCompanyById(userId);
-            String areas = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.AREA.getIndex(), company);
-            String lines = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.LINE.getIndex(), company);
-            res.put("feature", areas);
-            res.put("line", lines);
-        } catch (Exception e) {
-            return res;
-        }
-        res.put("message", "成功获取");
-        return res;
-    }
-
-    @RequestMapping(value = "getFeature")
-    @ResponseBody
-    public Map<String, Object> getFeaturesByUser(@RequestParam(required = true) Integer type, HttpSession session) {
-
-        Map<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        List<FeatureDto> list = featureManager.getFeaturesByUser(type, user);
-        if (list == null) {//获取列表失败
-            result.put("message", "获取列表出现错误");
-            return result;
-        } else {
-            result.put("data", list);
-            result.put("message", "获取列表成功");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "getSubFeatureList")
-    public void getSubFeatureList(@RequestParam(required = true) String jsonParams, @RequestParam(required = false) Long parentId, HttpServletResponse response, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Feature parent = featureManager.getFeatureById(parentId);
-        DataTable<FeatureDto> dtoDataTable = featureManager.getPageFeatureListByTye(jsonParams, parent, user);
-        Gson gson = new Gson();
-        String json = gson.toJson(dtoDataTable);
-        response.setCharacterEncoding("utf-8");
-        try {
-            response.getWriter().write(json);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @RequestMapping(value = "delete")
-    @ResponseBody
-    public Map<String, Object> deleteFeatureById(@RequestParam(required = true) Long id, HttpSession session) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        try {
-            String res = featureManager.invalidFeature(id.toString());
-            if (StringUtils.isBlank(res)) {
-                result.put("message", "删除失败");
-            } else {
-                result.put("message", "删除成功");
-                result.put("success", true);
-            }
-        } catch (Exception e) {
-            result.put("message", "删除失败");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "save")
-    @ResponseBody
-    public Map<String, Object> save(@RequestParam(required = true) String params, HttpSession session) {
-        Gson gson = new Gson();
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        Map markers = gson.fromJson(params, HashMap.class);
-        String featureName = (String) markers.get("featureName");
-        String memo = (String) markers.get("memo") == null ? "" : (String) markers.get("memo");
-        Long parentId = Long.valueOf(StringUtils.isBlank((String) markers.get("parentId")) ? "-1" : (String) markers.get("parentId"));//不知为什么转过来为Double
-        Long id = Long.valueOf(StringUtils.isBlank((String) markers.get("id")) ? "-1" : (String) markers.get("id"));
-
-
-        if (StringUtils.isBlank(featureName) || parentId.equals(-1L)) {
-            result.put("message", "必要参数未传送");
-            return result;
-        }
-        Feature feature = new Feature();
-        feature.setValid(1);
-        Feature parent = featureManager.getFeatureById(parentId);
-        feature.setParent(parent);
-        feature.setFeatureName(featureName);
-        feature.setMemo(memo);
-        feature.setOwner(user);
-        feature.setCompany(user.getCompany());
-        feature.setType(parent.getType());
-        if (!id.equals(-1L)) {
-            feature.setId(id);
-        }
-        try {
-            featureManager.saveOrupdateFeature(feature, user);
-            result.put("message", "保存成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "保存失败");
-        }
-        return result;
-
-    }
-
-
-    @RequestMapping(value = "getFeatureById")
-    @ResponseBody
-    public Map<String, Object> getFeatureById(@RequestParam(required = true) Long id) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        try {
-            FeatureDto feature = featureManager.getFeatureDtoById(id);
-            result.put("data", feature);
-            result.put("message", "获取成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "获取失败");
-        }
-        return result;
-
-    }
-
-}

diff --git a/src/main/java/com/casic/accessControl/feature/domain/Feature.java b/src/main/java/com/casic/accessControl/feature/domain/Feature.java
deleted file mode 100644
index c89a0c2..0000000
--- a/src/main/java/com/casic/accessControl/feature/domain/Feature.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.casic.accessControl.feature.domain;
-
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-
-import javax.persistence.*;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-//点的信息
-@Entity
-@Table(name = "feature")
-public class Feature {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private Long id;
-    @Column(name = "longitude")
-    private Double longitude;
-    @Column(name = "latitude")
-    private Double latitude;
-    @Column(name = "featureName")
-    private String featureName;
-    @Column(name = "type")
-    private int type;
-    @Column(name = "isValid")
-    private Integer isValid;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "parent")
-    private Feature parent;
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "parent")
-    private List<Feature> children;
-    @Column(name = "memo")
-    private String memo;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "owner", referencedColumnName = "id")
-    private User owner;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "company", referencedColumnName = "id")
-    private Company company;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer isValid() {
-        return isValid;
-    }
-
-    public void setValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public Feature getParent() {
-        return parent;
-    }
-
-    public void setParent(Feature parent) {
-        this.parent = parent;
-    }
-
-    public List<Feature> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<Feature> children) {
-        this.children = children;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public User getOwner() {
-        return owner;
-    }
-
-    public void setOwner(User owner) {
-        this.owner = owner;
-    }
-
-    public Company getCompany() {
-        return company;
-    }
-
-    public void setCompany(Company company) {
-        this.company = company;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java b/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
deleted file mode 100644
index 256f261..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import com.casic.accessControl.feature.domain.Feature;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/17.
- */
-public class FeatureDto {
-    private Long id;
-    private Double longitude;
-    private Double latitude;
-    private String featureName;
-    private int type;
-    private Integer isValid;
-    private String memo;
-    private Long parentId;
-
-    private String btnEdit = "<a href='#' class='btn mini blue'><i class='icon-edit'></i>编辑</a>";
-    private String btnDelete = "<a href='#' class='btn mini red'><i class='icon-trash'></i>删除</a>";
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer getIsValid() {
-        return isValid;
-    }
-
-    public void setIsValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public Long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getBtnEdit() {
-        return btnEdit;
-    }
-
-    public void setBtnEdit(String btnEdit) {
-        this.btnEdit = btnEdit;
-    }
-
-    public String getBtnDelete() {
-        return btnDelete;
-    }
-
-    public void setBtnDelete(String btnDelete) {
-        this.btnDelete = btnDelete;
-    }
-
-    public static FeatureDto convert2FeatureDto(Feature feature) {
-        if (feature == null) {
-            return null;
-        }
-        FeatureDto featureDto = new FeatureDto();
-        featureDto.setId(feature.getId());
-        featureDto.setFeatureName(feature.getFeatureName());
-        featureDto.setIsValid(feature.isValid());
-        featureDto.setLatitude(feature.getLatitude());
-        featureDto.setLongitude(feature.getLongitude());
-        featureDto.setMemo(feature.getMemo());
-        featureDto.setType(feature.getType());
-        if (feature.getParent() != null)
-            featureDto.setParentId(feature.getParent().getId());
-        return featureDto;
-    }
-
-    public static List<FeatureDto> convert2FeatureDtos(List<Feature> features) {
-        List<FeatureDto> featureDtos = new ArrayList<FeatureDto>();
-        for (Feature feature : features) {
-            featureDtos.add(convert2FeatureDto(feature));
-        }
-        return featureDtos;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java b/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
deleted file mode 100644
index 785dcba..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/19.
- */
-public class OrgDto {
-    private long id;
-
-    private String name;
-
-    private long parentId;
-
-    private List<OrgDto> children = new ArrayList<OrgDto>();
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(long parentId) {
-        this.parentId = parentId;
-    }
-
-    public List<OrgDto> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<OrgDto> children) {
-        this.children = children;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java b/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
deleted file mode 100644
index a475e21..0000000
--- a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
+++ /dev/null
@@ -1,316 +0,0 @@
-package com.casic.accessControl.feature.manager;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.core.page.Page;
-import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.marker.manager.MarkerManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.DataTableParameter;
-import com.casic.accessControl.util.DataTableUtils;
-import org.apache.commons.collections.CollectionUtils;
-import org.hibernate.Criteria;
-import org.hibernate.Query;
-import org.hibernate.criterion.Restrictions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.jdbc.object.SqlQuery;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-@Service
-public class FeatureManager extends HibernateEntityDao<Feature> {
-
-    private Logger logger = LoggerFactory.getLogger(this.getClass());
-    @Resource
-    private MarkerManager markerManager;
-
-
-    public Feature getFeatureById(Long id) {
-        Feature feature = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("id", id)).add(Restrictions.eq("isValid", 1));
-            feature = (Feature) criteria.list().get(0);
-        } catch (Exception e) {
-            return null;
-        }
-        return feature;
-    }
-
-    public FeatureDto getFeatureDtoById(Long id) {
-        return FeatureDto.convert2FeatureDto(getFeatureById(id));
-    }
-
-    /**
-     * 根据id，软删除某个点或线或片
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param ids 多个id
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public String invalidFeature(String ids) {
-        if (StringUtils.isBlank(ids) || ids.indexOf(")") != -1) {//未传入值，直接返回，防止无效查询,过滤非法请求，防止sql注入
-            return "";
-        }
-        String[] idsArr = ids.split(",");
-        StringBuilder canDeleteIds = new StringBuilder("");
-        StringBuilder cantDeleleIds = new StringBuilder("");
-        //找出能删除的和不能删除的id组合
-        for (String id : idsArr) {
-            Long longId = Long.valueOf(id);
-            if (this.isCanDelete(longId)) {
-                if (canDeleteIds.length() > 0) {
-                    canDeleteIds.append(",");
-                }
-                canDeleteIds.append(id);
-
-            } else {
-                if (cantDeleleIds.length() > 0) {
-                    cantDeleleIds.append(",");
-                }
-                cantDeleleIds.append(id);
-            }
-        }
-
-        String temp1Ids = canDeleteIds.toString();
-        String temp2Ids = cantDeleleIds.toString();
-        if (StringUtils.isNotBlank(temp2Ids)) {//有不能删除的，都不删除
-            return "";
-        }
-        Query query = this.getSession().createQuery("update Feature f set f.isValid = 0 where id in (" + temp1Ids + ")");
-        query.executeUpdate();
-
-        return "success";
-    }
-
-    /**
-     * 判断feature是否可以删除
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param id
-     * @return
-     */
-    private boolean isCanDelete(Long id) {
-        Feature feature = this.getFeatureById(id);
-        if (feature.getParent() == null) {//所有用户共用的根节点不能删除
-            return false;
-        }
-        if (CollectionUtils.isNotEmpty(feature.getChildren())) {
-            for (Feature child : feature.getChildren()) {
-                if (child.isValid() == 1) {
-                    return false;
-                }
-            }
-
-        }
-        List<Marker> markers = markerManager.getMarkerByFeature(feature);
-        if (CollectionUtils.isNotEmpty(markers)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * 将数据库中的feature信息按照参数更新
-     *
-     * @param feature
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public void saveOrupdateFeature(Feature feature, User user) {
-        this.getSession().saveOrUpdate(feature);
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param user 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByUser")
-    public List<FeatureDto> getFeaturesByUser(Integer type, User user) {
-        if (user == null) {
-            return Collections.emptyList();
-        }
-        Company company = user.getCompany();
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("type", type));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-        return FeatureDto.convert2FeatureDtos(features);
-    }
-
-    /**
-     * 分页使用，datatable获取相应type的feature某页数据
-     *
-     * @param params
-     * @param user
-     * @return
-     */
-    public DataTable<FeatureDto> getPageFeatureListByTye(String params, Feature parent, User user) {
-        DataTable<FeatureDto> result = new DataTable<FeatureDto>();
-        DataTableParameter parameter = DataTableUtils.getDataTableParameterByJsonParam(params);
-        int start = parameter.getiDisplayStart();
-        int pageSize = parameter.getiDisplayLength();
-        int pageNo = (start / pageSize) + 1;
-        Criteria criteria = this.createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        Company company = user.getCompany();
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("isValid", 1)).add(Restrictions.eq("parent", parent));
-        Page page = pagedQuery(criteria, pageNo, pageSize);
-        List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos((List<Feature>) page.getResult());
-        result.setAaData(featureDtos);
-        result.setiTotalDisplayRecords((int) page.getTotalCount());
-        result.setiTotalRecords((int) page.getTotalCount());
-        result.setsEcho(parameter.getsEcho());
-        return result;
-
-
-    }
-
-    /**
-     * 获取层次结构列表,增加缓存
-     *
-     * @param type
-     * @param company
-     * @return
-     */
-    @Cacheable(value = "getOrgList")
-    public String getOrgList(Integer type, Company company) {
-        List<OrgDto> orgDtos = new ArrayList<OrgDto>();
-        List<Feature> features = this.getRootFeatures(type);
-        for (Feature feature : features) {
-            orgDtos.add(this.getChildrenByParentId(feature.getId(), company));
-        }
-        String jsonStr = null;
-        try {
-            jsonStr = new JsonMapper().toJson(orgDtos);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return jsonStr;
-    }
-
-    //    @Cacheable(value = "getChildrenByParentId", key = "#id")
-    public OrgDto getChildrenByParentId(Long id, Company company) {
-        if (id == null) {
-            return null;
-        }
-        Feature feature = getFeatureById(id);
-        if (feature == null) {
-            return null;
-        }
-        //创建OrgDto节点
-        OrgDto orgDto = new OrgDto();
-        orgDto.setId(id); //保存ID信息
-        orgDto.setName(feature.getFeatureName());
-        if (feature.getParent() != null) {
-            orgDto.setParentId(feature.getParent().getId());
-        }
-        List<Feature> departments = this.getActiveChildrenOrgs(feature, company);
-        for (Feature fea : departments) {
-            orgDto.getChildren().add(this.getChildrenByParentId(fea.getId(), company));
-        }
-        return orgDto;
-    }
-
-    //    @Cacheable(value = "getActiveChildrenOrgs", key = "#department.getId()")
-    private List<Feature> getActiveChildrenOrgs(Feature department, Company company) {
-        List<Feature> features = new ArrayList<Feature>();
-        for (Feature feature : department.getChildren()) {
-            if (feature.isValid() == 1 && feature.getCompany().getId().equals(company.getId())) {
-                features.add(feature);
-            }
-        }
-        return features;
-    }
-
-
-    public List<Feature> getRootFeatures(Integer type) {
-        List<Feature> features = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("type", type)).add(Restrictions.isNull("parent"));
-            features = criteria.list();
-        } catch (Exception e) {
-            return Collections.emptyList();
-        }
-        return features;
-
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param company 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByCompany", key = "#company.getId()")
-    public List<Feature> getFeaturesByCompany(Company company) {
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-        criteria.add(Restrictions.eq("company", company));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-
-        for (Feature f : features) {
-            f.getChildren().toString();
-            f.getOwner().toString();
-            if (f.getParent() != null)
-                f.getParent().toString();
-        }
-        return features;
-    }
-
-    /**
-     * 根据组织结构的id获取叶子节点
-     ***重要：**已更改为包含本节点****
-     * @param type
-     * @param feature
-     * @return
-     */
-    public List<Feature> getLeafByParentId(Integer type, Feature feature) {
-        if (feature == null || feature.isValid() == 0) return Collections.emptyList();
-        List<Feature> features = new ArrayList<Feature>();
-        if (CollectionUtils.isEmpty(feature.getChildren())) {
-            features.add(feature);
-            return features;
-        }
-        List<Feature> children = feature.getChildren();
-        boolean flag = false;
-        for (Feature child : children) {
-            if (child.isValid() == 1) {
-                flag = true;
-                features.addAll(getLeafByParentId(type, child));
-            }
-        }
-//        if (!flag) {//没有有效的子节点
-            features.add(feature);
-//        }
-        return features;
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java b/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
deleted file mode 100644
index a706a36..0000000
--- a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package com.casic.accessControl.feature.web;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.Role;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.CompanyManager;
-import com.casic.accessControl.user.manager.UserManager;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.StringUtils;
-import com.casic.accessControl.xls.Common;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import sun.org.mozilla.javascript.internal.EcmaError;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.IOException;
-import java.util.*;
-
-/**
- * 提供http访问接口
- * Created by lenovo on 2016/5/16.
- */
-@Controller
-@RequestMapping(value = "feature")
-public class FeatureController {
-    @Autowired
-    private FeatureManager featureManager;
-    @Autowired
-    private UserManager userManager;
-    @Autowired
-    private CompanyManager companyManager;
-
-    @RequestMapping(value = "org-list")
-    @ResponseBody
-    public String getOrgList(@RequestParam(required = true) Integer type, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Company company = user.getCompany();
-        return featureManager.getOrgList(type, company);
-    }
-
-    @RequestMapping(value = "org-list-na")
-    @ResponseBody
-    public Map<String, String> getOrgListNa(@RequestParam Long userId) {//na端所有传过来的userid都是公司id
-        Map<String, String> res = new HashMap<String, String>();
-        res.put("message", "列表获取失败");
-        try {
-//            User user = userManager.getUserById(userId);//获取当前登录用户
-//            Company company = user.getCompany();
-            Company company = companyManager.getCompanyById(userId);
-            String areas = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.AREA.getIndex(), company);
-            String lines = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.LINE.getIndex(), company);
-            res.put("feature", areas);
-            res.put("line", lines);
-        } catch (Exception e) {
-            return res;
-        }
-        res.put("message", "成功获取");
-        return res;
-    }
-
-    @RequestMapping(value = "getFeature")
-    @ResponseBody
-    public Map<String, Object> getFeaturesByUser(@RequestParam(required = true) Integer type, HttpSession session) {
-
-        Map<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        List<FeatureDto> list = featureManager.getFeaturesByUser(type, user);
-        if (list == null) {//获取列表失败
-            result.put("message", "获取列表出现错误");
-            return result;
-        } else {
-            result.put("data", list);
-            result.put("message", "获取列表成功");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "getSubFeatureList")
-    public void getSubFeatureList(@RequestParam(required = true) String jsonParams, @RequestParam(required = false) Long parentId, HttpServletResponse response, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Feature parent = featureManager.getFeatureById(parentId);
-        DataTable<FeatureDto> dtoDataTable = featureManager.getPageFeatureListByTye(jsonParams, parent, user);
-        Gson gson = new Gson();
-        String json = gson.toJson(dtoDataTable);
-        response.setCharacterEncoding("utf-8");
-        try {
-            response.getWriter().write(json);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @RequestMapping(value = "delete")
-    @ResponseBody
-    public Map<String, Object> deleteFeatureById(@RequestParam(required = true) Long id, HttpSession session) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        try {
-            String res = featureManager.invalidFeature(id.toString());
-            if (StringUtils.isBlank(res)) {
-                result.put("message", "删除失败");
-            } else {
-                result.put("message", "删除成功");
-                result.put("success", true);
-            }
-        } catch (Exception e) {
-            result.put("message", "删除失败");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "save")
-    @ResponseBody
-    public Map<String, Object> save(@RequestParam(required = true) String params, HttpSession session) {
-        Gson gson = new Gson();
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        Map markers = gson.fromJson(params, HashMap.class);
-        String featureName = (String) markers.get("featureName");
-        String memo = (String) markers.get("memo") == null ? "" : (String) markers.get("memo");
-        Long parentId = Long.valueOf(StringUtils.isBlank((String) markers.get("parentId")) ? "-1" : (String) markers.get("parentId"));//不知为什么转过来为Double
-        Long id = Long.valueOf(StringUtils.isBlank((String) markers.get("id")) ? "-1" : (String) markers.get("id"));
-
-
-        if (StringUtils.isBlank(featureName) || parentId.equals(-1L)) {
-            result.put("message", "必要参数未传送");
-            return result;
-        }
-        Feature feature = new Feature();
-        feature.setValid(1);
-        Feature parent = featureManager.getFeatureById(parentId);
-        feature.setParent(parent);
-        feature.setFeatureName(featureName);
-        feature.setMemo(memo);
-        feature.setOwner(user);
-        feature.setCompany(user.getCompany());
-        feature.setType(parent.getType());
-        if (!id.equals(-1L)) {
-            feature.setId(id);
-        }
-        try {
-            featureManager.saveOrupdateFeature(feature, user);
-            result.put("message", "保存成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "保存失败");
-        }
-        return result;
-
-    }
-
-
-    @RequestMapping(value = "getFeatureById")
-    @ResponseBody
-    public Map<String, Object> getFeatureById(@RequestParam(required = true) Long id) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        try {
-            FeatureDto feature = featureManager.getFeatureDtoById(id);
-            result.put("data", feature);
-            result.put("message", "获取成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "获取失败");
-        }
-        return result;
-
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
index 08a290e..3f53635 100644
--- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
+++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
@@ -1,6 +1,6 @@
 package com.casic.accessControl.marker.dto;
 
-import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.domain.Feature;
 import com.casic.accessControl.marker.domain.Marker;
 import org.apache.commons.collections.CollectionUtils;
 

diff --git a/src/main/java/com/casic/accessControl/feature/domain/Feature.java b/src/main/java/com/casic/accessControl/feature/domain/Feature.java
deleted file mode 100644
index c89a0c2..0000000
--- a/src/main/java/com/casic/accessControl/feature/domain/Feature.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.casic.accessControl.feature.domain;
-
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-
-import javax.persistence.*;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-//点的信息
-@Entity
-@Table(name = "feature")
-public class Feature {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private Long id;
-    @Column(name = "longitude")
-    private Double longitude;
-    @Column(name = "latitude")
-    private Double latitude;
-    @Column(name = "featureName")
-    private String featureName;
-    @Column(name = "type")
-    private int type;
-    @Column(name = "isValid")
-    private Integer isValid;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "parent")
-    private Feature parent;
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "parent")
-    private List<Feature> children;
-    @Column(name = "memo")
-    private String memo;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "owner", referencedColumnName = "id")
-    private User owner;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "company", referencedColumnName = "id")
-    private Company company;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer isValid() {
-        return isValid;
-    }
-
-    public void setValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public Feature getParent() {
-        return parent;
-    }
-
-    public void setParent(Feature parent) {
-        this.parent = parent;
-    }
-
-    public List<Feature> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<Feature> children) {
-        this.children = children;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public User getOwner() {
-        return owner;
-    }
-
-    public void setOwner(User owner) {
-        this.owner = owner;
-    }
-
-    public Company getCompany() {
-        return company;
-    }
-
-    public void setCompany(Company company) {
-        this.company = company;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java b/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
deleted file mode 100644
index 256f261..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import com.casic.accessControl.feature.domain.Feature;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/17.
- */
-public class FeatureDto {
-    private Long id;
-    private Double longitude;
-    private Double latitude;
-    private String featureName;
-    private int type;
-    private Integer isValid;
-    private String memo;
-    private Long parentId;
-
-    private String btnEdit = "<a href='#' class='btn mini blue'><i class='icon-edit'></i>编辑</a>";
-    private String btnDelete = "<a href='#' class='btn mini red'><i class='icon-trash'></i>删除</a>";
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer getIsValid() {
-        return isValid;
-    }
-
-    public void setIsValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public Long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getBtnEdit() {
-        return btnEdit;
-    }
-
-    public void setBtnEdit(String btnEdit) {
-        this.btnEdit = btnEdit;
-    }
-
-    public String getBtnDelete() {
-        return btnDelete;
-    }
-
-    public void setBtnDelete(String btnDelete) {
-        this.btnDelete = btnDelete;
-    }
-
-    public static FeatureDto convert2FeatureDto(Feature feature) {
-        if (feature == null) {
-            return null;
-        }
-        FeatureDto featureDto = new FeatureDto();
-        featureDto.setId(feature.getId());
-        featureDto.setFeatureName(feature.getFeatureName());
-        featureDto.setIsValid(feature.isValid());
-        featureDto.setLatitude(feature.getLatitude());
-        featureDto.setLongitude(feature.getLongitude());
-        featureDto.setMemo(feature.getMemo());
-        featureDto.setType(feature.getType());
-        if (feature.getParent() != null)
-            featureDto.setParentId(feature.getParent().getId());
-        return featureDto;
-    }
-
-    public static List<FeatureDto> convert2FeatureDtos(List<Feature> features) {
-        List<FeatureDto> featureDtos = new ArrayList<FeatureDto>();
-        for (Feature feature : features) {
-            featureDtos.add(convert2FeatureDto(feature));
-        }
-        return featureDtos;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java b/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
deleted file mode 100644
index 785dcba..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/19.
- */
-public class OrgDto {
-    private long id;
-
-    private String name;
-
-    private long parentId;
-
-    private List<OrgDto> children = new ArrayList<OrgDto>();
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(long parentId) {
-        this.parentId = parentId;
-    }
-
-    public List<OrgDto> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<OrgDto> children) {
-        this.children = children;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java b/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
deleted file mode 100644
index a475e21..0000000
--- a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
+++ /dev/null
@@ -1,316 +0,0 @@
-package com.casic.accessControl.feature.manager;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.core.page.Page;
-import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.marker.manager.MarkerManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.DataTableParameter;
-import com.casic.accessControl.util.DataTableUtils;
-import org.apache.commons.collections.CollectionUtils;
-import org.hibernate.Criteria;
-import org.hibernate.Query;
-import org.hibernate.criterion.Restrictions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.jdbc.object.SqlQuery;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-@Service
-public class FeatureManager extends HibernateEntityDao<Feature> {
-
-    private Logger logger = LoggerFactory.getLogger(this.getClass());
-    @Resource
-    private MarkerManager markerManager;
-
-
-    public Feature getFeatureById(Long id) {
-        Feature feature = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("id", id)).add(Restrictions.eq("isValid", 1));
-            feature = (Feature) criteria.list().get(0);
-        } catch (Exception e) {
-            return null;
-        }
-        return feature;
-    }
-
-    public FeatureDto getFeatureDtoById(Long id) {
-        return FeatureDto.convert2FeatureDto(getFeatureById(id));
-    }
-
-    /**
-     * 根据id，软删除某个点或线或片
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param ids 多个id
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public String invalidFeature(String ids) {
-        if (StringUtils.isBlank(ids) || ids.indexOf(")") != -1) {//未传入值，直接返回，防止无效查询,过滤非法请求，防止sql注入
-            return "";
-        }
-        String[] idsArr = ids.split(",");
-        StringBuilder canDeleteIds = new StringBuilder("");
-        StringBuilder cantDeleleIds = new StringBuilder("");
-        //找出能删除的和不能删除的id组合
-        for (String id : idsArr) {
-            Long longId = Long.valueOf(id);
-            if (this.isCanDelete(longId)) {
-                if (canDeleteIds.length() > 0) {
-                    canDeleteIds.append(",");
-                }
-                canDeleteIds.append(id);
-
-            } else {
-                if (cantDeleleIds.length() > 0) {
-                    cantDeleleIds.append(",");
-                }
-                cantDeleleIds.append(id);
-            }
-        }
-
-        String temp1Ids = canDeleteIds.toString();
-        String temp2Ids = cantDeleleIds.toString();
-        if (StringUtils.isNotBlank(temp2Ids)) {//有不能删除的，都不删除
-            return "";
-        }
-        Query query = this.getSession().createQuery("update Feature f set f.isValid = 0 where id in (" + temp1Ids + ")");
-        query.executeUpdate();
-
-        return "success";
-    }
-
-    /**
-     * 判断feature是否可以删除
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param id
-     * @return
-     */
-    private boolean isCanDelete(Long id) {
-        Feature feature = this.getFeatureById(id);
-        if (feature.getParent() == null) {//所有用户共用的根节点不能删除
-            return false;
-        }
-        if (CollectionUtils.isNotEmpty(feature.getChildren())) {
-            for (Feature child : feature.getChildren()) {
-                if (child.isValid() == 1) {
-                    return false;
-                }
-            }
-
-        }
-        List<Marker> markers = markerManager.getMarkerByFeature(feature);
-        if (CollectionUtils.isNotEmpty(markers)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * 将数据库中的feature信息按照参数更新
-     *
-     * @param feature
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public void saveOrupdateFeature(Feature feature, User user) {
-        this.getSession().saveOrUpdate(feature);
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param user 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByUser")
-    public List<FeatureDto> getFeaturesByUser(Integer type, User user) {
-        if (user == null) {
-            return Collections.emptyList();
-        }
-        Company company = user.getCompany();
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("type", type));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-        return FeatureDto.convert2FeatureDtos(features);
-    }
-
-    /**
-     * 分页使用，datatable获取相应type的feature某页数据
-     *
-     * @param params
-     * @param user
-     * @return
-     */
-    public DataTable<FeatureDto> getPageFeatureListByTye(String params, Feature parent, User user) {
-        DataTable<FeatureDto> result = new DataTable<FeatureDto>();
-        DataTableParameter parameter = DataTableUtils.getDataTableParameterByJsonParam(params);
-        int start = parameter.getiDisplayStart();
-        int pageSize = parameter.getiDisplayLength();
-        int pageNo = (start / pageSize) + 1;
-        Criteria criteria = this.createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        Company company = user.getCompany();
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("isValid", 1)).add(Restrictions.eq("parent", parent));
-        Page page = pagedQuery(criteria, pageNo, pageSize);
-        List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos((List<Feature>) page.getResult());
-        result.setAaData(featureDtos);
-        result.setiTotalDisplayRecords((int) page.getTotalCount());
-        result.setiTotalRecords((int) page.getTotalCount());
-        result.setsEcho(parameter.getsEcho());
-        return result;
-
-
-    }
-
-    /**
-     * 获取层次结构列表,增加缓存
-     *
-     * @param type
-     * @param company
-     * @return
-     */
-    @Cacheable(value = "getOrgList")
-    public String getOrgList(Integer type, Company company) {
-        List<OrgDto> orgDtos = new ArrayList<OrgDto>();
-        List<Feature> features = this.getRootFeatures(type);
-        for (Feature feature : features) {
-            orgDtos.add(this.getChildrenByParentId(feature.getId(), company));
-        }
-        String jsonStr = null;
-        try {
-            jsonStr = new JsonMapper().toJson(orgDtos);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return jsonStr;
-    }
-
-    //    @Cacheable(value = "getChildrenByParentId", key = "#id")
-    public OrgDto getChildrenByParentId(Long id, Company company) {
-        if (id == null) {
-            return null;
-        }
-        Feature feature = getFeatureById(id);
-        if (feature == null) {
-            return null;
-        }
-        //创建OrgDto节点
-        OrgDto orgDto = new OrgDto();
-        orgDto.setId(id); //保存ID信息
-        orgDto.setName(feature.getFeatureName());
-        if (feature.getParent() != null) {
-            orgDto.setParentId(feature.getParent().getId());
-        }
-        List<Feature> departments = this.getActiveChildrenOrgs(feature, company);
-        for (Feature fea : departments) {
-            orgDto.getChildren().add(this.getChildrenByParentId(fea.getId(), company));
-        }
-        return orgDto;
-    }
-
-    //    @Cacheable(value = "getActiveChildrenOrgs", key = "#department.getId()")
-    private List<Feature> getActiveChildrenOrgs(Feature department, Company company) {
-        List<Feature> features = new ArrayList<Feature>();
-        for (Feature feature : department.getChildren()) {
-            if (feature.isValid() == 1 && feature.getCompany().getId().equals(company.getId())) {
-                features.add(feature);
-            }
-        }
-        return features;
-    }
-
-
-    public List<Feature> getRootFeatures(Integer type) {
-        List<Feature> features = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("type", type)).add(Restrictions.isNull("parent"));
-            features = criteria.list();
-        } catch (Exception e) {
-            return Collections.emptyList();
-        }
-        return features;
-
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param company 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByCompany", key = "#company.getId()")
-    public List<Feature> getFeaturesByCompany(Company company) {
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-        criteria.add(Restrictions.eq("company", company));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-
-        for (Feature f : features) {
-            f.getChildren().toString();
-            f.getOwner().toString();
-            if (f.getParent() != null)
-                f.getParent().toString();
-        }
-        return features;
-    }
-
-    /**
-     * 根据组织结构的id获取叶子节点
-     ***重要：**已更改为包含本节点****
-     * @param type
-     * @param feature
-     * @return
-     */
-    public List<Feature> getLeafByParentId(Integer type, Feature feature) {
-        if (feature == null || feature.isValid() == 0) return Collections.emptyList();
-        List<Feature> features = new ArrayList<Feature>();
-        if (CollectionUtils.isEmpty(feature.getChildren())) {
-            features.add(feature);
-            return features;
-        }
-        List<Feature> children = feature.getChildren();
-        boolean flag = false;
-        for (Feature child : children) {
-            if (child.isValid() == 1) {
-                flag = true;
-                features.addAll(getLeafByParentId(type, child));
-            }
-        }
-//        if (!flag) {//没有有效的子节点
-            features.add(feature);
-//        }
-        return features;
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java b/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
deleted file mode 100644
index a706a36..0000000
--- a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package com.casic.accessControl.feature.web;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.Role;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.CompanyManager;
-import com.casic.accessControl.user.manager.UserManager;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.StringUtils;
-import com.casic.accessControl.xls.Common;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import sun.org.mozilla.javascript.internal.EcmaError;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.IOException;
-import java.util.*;
-
-/**
- * 提供http访问接口
- * Created by lenovo on 2016/5/16.
- */
-@Controller
-@RequestMapping(value = "feature")
-public class FeatureController {
-    @Autowired
-    private FeatureManager featureManager;
-    @Autowired
-    private UserManager userManager;
-    @Autowired
-    private CompanyManager companyManager;
-
-    @RequestMapping(value = "org-list")
-    @ResponseBody
-    public String getOrgList(@RequestParam(required = true) Integer type, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Company company = user.getCompany();
-        return featureManager.getOrgList(type, company);
-    }
-
-    @RequestMapping(value = "org-list-na")
-    @ResponseBody
-    public Map<String, String> getOrgListNa(@RequestParam Long userId) {//na端所有传过来的userid都是公司id
-        Map<String, String> res = new HashMap<String, String>();
-        res.put("message", "列表获取失败");
-        try {
-//            User user = userManager.getUserById(userId);//获取当前登录用户
-//            Company company = user.getCompany();
-            Company company = companyManager.getCompanyById(userId);
-            String areas = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.AREA.getIndex(), company);
-            String lines = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.LINE.getIndex(), company);
-            res.put("feature", areas);
-            res.put("line", lines);
-        } catch (Exception e) {
-            return res;
-        }
-        res.put("message", "成功获取");
-        return res;
-    }
-
-    @RequestMapping(value = "getFeature")
-    @ResponseBody
-    public Map<String, Object> getFeaturesByUser(@RequestParam(required = true) Integer type, HttpSession session) {
-
-        Map<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        List<FeatureDto> list = featureManager.getFeaturesByUser(type, user);
-        if (list == null) {//获取列表失败
-            result.put("message", "获取列表出现错误");
-            return result;
-        } else {
-            result.put("data", list);
-            result.put("message", "获取列表成功");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "getSubFeatureList")
-    public void getSubFeatureList(@RequestParam(required = true) String jsonParams, @RequestParam(required = false) Long parentId, HttpServletResponse response, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Feature parent = featureManager.getFeatureById(parentId);
-        DataTable<FeatureDto> dtoDataTable = featureManager.getPageFeatureListByTye(jsonParams, parent, user);
-        Gson gson = new Gson();
-        String json = gson.toJson(dtoDataTable);
-        response.setCharacterEncoding("utf-8");
-        try {
-            response.getWriter().write(json);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @RequestMapping(value = "delete")
-    @ResponseBody
-    public Map<String, Object> deleteFeatureById(@RequestParam(required = true) Long id, HttpSession session) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        try {
-            String res = featureManager.invalidFeature(id.toString());
-            if (StringUtils.isBlank(res)) {
-                result.put("message", "删除失败");
-            } else {
-                result.put("message", "删除成功");
-                result.put("success", true);
-            }
-        } catch (Exception e) {
-            result.put("message", "删除失败");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "save")
-    @ResponseBody
-    public Map<String, Object> save(@RequestParam(required = true) String params, HttpSession session) {
-        Gson gson = new Gson();
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        Map markers = gson.fromJson(params, HashMap.class);
-        String featureName = (String) markers.get("featureName");
-        String memo = (String) markers.get("memo") == null ? "" : (String) markers.get("memo");
-        Long parentId = Long.valueOf(StringUtils.isBlank((String) markers.get("parentId")) ? "-1" : (String) markers.get("parentId"));//不知为什么转过来为Double
-        Long id = Long.valueOf(StringUtils.isBlank((String) markers.get("id")) ? "-1" : (String) markers.get("id"));
-
-
-        if (StringUtils.isBlank(featureName) || parentId.equals(-1L)) {
-            result.put("message", "必要参数未传送");
-            return result;
-        }
-        Feature feature = new Feature();
-        feature.setValid(1);
-        Feature parent = featureManager.getFeatureById(parentId);
-        feature.setParent(parent);
-        feature.setFeatureName(featureName);
-        feature.setMemo(memo);
-        feature.setOwner(user);
-        feature.setCompany(user.getCompany());
-        feature.setType(parent.getType());
-        if (!id.equals(-1L)) {
-            feature.setId(id);
-        }
-        try {
-            featureManager.saveOrupdateFeature(feature, user);
-            result.put("message", "保存成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "保存失败");
-        }
-        return result;
-
-    }
-
-
-    @RequestMapping(value = "getFeatureById")
-    @ResponseBody
-    public Map<String, Object> getFeatureById(@RequestParam(required = true) Long id) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        try {
-            FeatureDto feature = featureManager.getFeatureDtoById(id);
-            result.put("data", feature);
-            result.put("message", "获取成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "获取失败");
-        }
-        return result;
-
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
index 08a290e..3f53635 100644
--- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
+++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
@@ -1,6 +1,6 @@
 package com.casic.accessControl.marker.dto;
 
-import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.domain.Feature;
 import com.casic.accessControl.marker.domain.Marker;
 import org.apache.commons.collections.CollectionUtils;
 
diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
index 080b291..7fe7434 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -4,8 +4,6 @@
 import com.casic.accessControl.core.hibernate.HibernateEntityDao;
 import com.casic.accessControl.core.page.Page;
 import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.user.domain.Company;
@@ -49,9 +47,6 @@
 public class MarkerManager extends HibernateEntityDao<Marker> {
 
     @Resource
-    private FeatureManager featureManager;
-
-    @Resource
     private UserManager userInfoManager;
 
 
@@ -154,33 +149,33 @@
 
     //获取marker
 //    @Cacheable(value = "getMarkerByFeature", key = "#feature.getId()")
-    public List<Marker> getMarkerByFeature(Feature feature) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            criteria.add(Restrictions.eq("belongLine", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            criteria.add(Restrictions.eq("belongLine", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
-    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
-            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
+//            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
     public boolean saveMarker(Marker marker) {
         try {
@@ -465,7 +460,7 @@
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setLayStyle(sheet.getCell(indexMap.get("layStyle"), i).getContents());
-                } else if(recordTypeFlag == 4) {
+                } else if (recordTypeFlag == 4) {
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setBelowType(sheet.getCell(indexMap.get("belowType"), i).getContents());

diff --git a/src/main/java/com/casic/accessControl/feature/domain/Feature.java b/src/main/java/com/casic/accessControl/feature/domain/Feature.java
deleted file mode 100644
index c89a0c2..0000000
--- a/src/main/java/com/casic/accessControl/feature/domain/Feature.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.casic.accessControl.feature.domain;
-
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-
-import javax.persistence.*;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-//点的信息
-@Entity
-@Table(name = "feature")
-public class Feature {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private Long id;
-    @Column(name = "longitude")
-    private Double longitude;
-    @Column(name = "latitude")
-    private Double latitude;
-    @Column(name = "featureName")
-    private String featureName;
-    @Column(name = "type")
-    private int type;
-    @Column(name = "isValid")
-    private Integer isValid;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "parent")
-    private Feature parent;
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "parent")
-    private List<Feature> children;
-    @Column(name = "memo")
-    private String memo;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "owner", referencedColumnName = "id")
-    private User owner;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "company", referencedColumnName = "id")
-    private Company company;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer isValid() {
-        return isValid;
-    }
-
-    public void setValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public Feature getParent() {
-        return parent;
-    }
-
-    public void setParent(Feature parent) {
-        this.parent = parent;
-    }
-
-    public List<Feature> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<Feature> children) {
-        this.children = children;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public User getOwner() {
-        return owner;
-    }
-
-    public void setOwner(User owner) {
-        this.owner = owner;
-    }
-
-    public Company getCompany() {
-        return company;
-    }
-
-    public void setCompany(Company company) {
-        this.company = company;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java b/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
deleted file mode 100644
index 256f261..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import com.casic.accessControl.feature.domain.Feature;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/17.
- */
-public class FeatureDto {
-    private Long id;
-    private Double longitude;
-    private Double latitude;
-    private String featureName;
-    private int type;
-    private Integer isValid;
-    private String memo;
-    private Long parentId;
-
-    private String btnEdit = "<a href='#' class='btn mini blue'><i class='icon-edit'></i>编辑</a>";
-    private String btnDelete = "<a href='#' class='btn mini red'><i class='icon-trash'></i>删除</a>";
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer getIsValid() {
-        return isValid;
-    }
-
-    public void setIsValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public Long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getBtnEdit() {
-        return btnEdit;
-    }
-
-    public void setBtnEdit(String btnEdit) {
-        this.btnEdit = btnEdit;
-    }
-
-    public String getBtnDelete() {
-        return btnDelete;
-    }
-
-    public void setBtnDelete(String btnDelete) {
-        this.btnDelete = btnDelete;
-    }
-
-    public static FeatureDto convert2FeatureDto(Feature feature) {
-        if (feature == null) {
-            return null;
-        }
-        FeatureDto featureDto = new FeatureDto();
-        featureDto.setId(feature.getId());
-        featureDto.setFeatureName(feature.getFeatureName());
-        featureDto.setIsValid(feature.isValid());
-        featureDto.setLatitude(feature.getLatitude());
-        featureDto.setLongitude(feature.getLongitude());
-        featureDto.setMemo(feature.getMemo());
-        featureDto.setType(feature.getType());
-        if (feature.getParent() != null)
-            featureDto.setParentId(feature.getParent().getId());
-        return featureDto;
-    }
-
-    public static List<FeatureDto> convert2FeatureDtos(List<Feature> features) {
-        List<FeatureDto> featureDtos = new ArrayList<FeatureDto>();
-        for (Feature feature : features) {
-            featureDtos.add(convert2FeatureDto(feature));
-        }
-        return featureDtos;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java b/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
deleted file mode 100644
index 785dcba..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/19.
- */
-public class OrgDto {
-    private long id;
-
-    private String name;
-
-    private long parentId;
-
-    private List<OrgDto> children = new ArrayList<OrgDto>();
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(long parentId) {
-        this.parentId = parentId;
-    }
-
-    public List<OrgDto> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<OrgDto> children) {
-        this.children = children;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java b/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
deleted file mode 100644
index a475e21..0000000
--- a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
+++ /dev/null
@@ -1,316 +0,0 @@
-package com.casic.accessControl.feature.manager;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.core.page.Page;
-import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.marker.manager.MarkerManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.DataTableParameter;
-import com.casic.accessControl.util.DataTableUtils;
-import org.apache.commons.collections.CollectionUtils;
-import org.hibernate.Criteria;
-import org.hibernate.Query;
-import org.hibernate.criterion.Restrictions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.jdbc.object.SqlQuery;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-@Service
-public class FeatureManager extends HibernateEntityDao<Feature> {
-
-    private Logger logger = LoggerFactory.getLogger(this.getClass());
-    @Resource
-    private MarkerManager markerManager;
-
-
-    public Feature getFeatureById(Long id) {
-        Feature feature = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("id", id)).add(Restrictions.eq("isValid", 1));
-            feature = (Feature) criteria.list().get(0);
-        } catch (Exception e) {
-            return null;
-        }
-        return feature;
-    }
-
-    public FeatureDto getFeatureDtoById(Long id) {
-        return FeatureDto.convert2FeatureDto(getFeatureById(id));
-    }
-
-    /**
-     * 根据id，软删除某个点或线或片
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param ids 多个id
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public String invalidFeature(String ids) {
-        if (StringUtils.isBlank(ids) || ids.indexOf(")") != -1) {//未传入值，直接返回，防止无效查询,过滤非法请求，防止sql注入
-            return "";
-        }
-        String[] idsArr = ids.split(",");
-        StringBuilder canDeleteIds = new StringBuilder("");
-        StringBuilder cantDeleleIds = new StringBuilder("");
-        //找出能删除的和不能删除的id组合
-        for (String id : idsArr) {
-            Long longId = Long.valueOf(id);
-            if (this.isCanDelete(longId)) {
-                if (canDeleteIds.length() > 0) {
-                    canDeleteIds.append(",");
-                }
-                canDeleteIds.append(id);
-
-            } else {
-                if (cantDeleleIds.length() > 0) {
-                    cantDeleleIds.append(",");
-                }
-                cantDeleleIds.append(id);
-            }
-        }
-
-        String temp1Ids = canDeleteIds.toString();
-        String temp2Ids = cantDeleleIds.toString();
-        if (StringUtils.isNotBlank(temp2Ids)) {//有不能删除的，都不删除
-            return "";
-        }
-        Query query = this.getSession().createQuery("update Feature f set f.isValid = 0 where id in (" + temp1Ids + ")");
-        query.executeUpdate();
-
-        return "success";
-    }
-
-    /**
-     * 判断feature是否可以删除
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param id
-     * @return
-     */
-    private boolean isCanDelete(Long id) {
-        Feature feature = this.getFeatureById(id);
-        if (feature.getParent() == null) {//所有用户共用的根节点不能删除
-            return false;
-        }
-        if (CollectionUtils.isNotEmpty(feature.getChildren())) {
-            for (Feature child : feature.getChildren()) {
-                if (child.isValid() == 1) {
-                    return false;
-                }
-            }
-
-        }
-        List<Marker> markers = markerManager.getMarkerByFeature(feature);
-        if (CollectionUtils.isNotEmpty(markers)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * 将数据库中的feature信息按照参数更新
-     *
-     * @param feature
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public void saveOrupdateFeature(Feature feature, User user) {
-        this.getSession().saveOrUpdate(feature);
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param user 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByUser")
-    public List<FeatureDto> getFeaturesByUser(Integer type, User user) {
-        if (user == null) {
-            return Collections.emptyList();
-        }
-        Company company = user.getCompany();
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("type", type));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-        return FeatureDto.convert2FeatureDtos(features);
-    }
-
-    /**
-     * 分页使用，datatable获取相应type的feature某页数据
-     *
-     * @param params
-     * @param user
-     * @return
-     */
-    public DataTable<FeatureDto> getPageFeatureListByTye(String params, Feature parent, User user) {
-        DataTable<FeatureDto> result = new DataTable<FeatureDto>();
-        DataTableParameter parameter = DataTableUtils.getDataTableParameterByJsonParam(params);
-        int start = parameter.getiDisplayStart();
-        int pageSize = parameter.getiDisplayLength();
-        int pageNo = (start / pageSize) + 1;
-        Criteria criteria = this.createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        Company company = user.getCompany();
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("isValid", 1)).add(Restrictions.eq("parent", parent));
-        Page page = pagedQuery(criteria, pageNo, pageSize);
-        List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos((List<Feature>) page.getResult());
-        result.setAaData(featureDtos);
-        result.setiTotalDisplayRecords((int) page.getTotalCount());
-        result.setiTotalRecords((int) page.getTotalCount());
-        result.setsEcho(parameter.getsEcho());
-        return result;
-
-
-    }
-
-    /**
-     * 获取层次结构列表,增加缓存
-     *
-     * @param type
-     * @param company
-     * @return
-     */
-    @Cacheable(value = "getOrgList")
-    public String getOrgList(Integer type, Company company) {
-        List<OrgDto> orgDtos = new ArrayList<OrgDto>();
-        List<Feature> features = this.getRootFeatures(type);
-        for (Feature feature : features) {
-            orgDtos.add(this.getChildrenByParentId(feature.getId(), company));
-        }
-        String jsonStr = null;
-        try {
-            jsonStr = new JsonMapper().toJson(orgDtos);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return jsonStr;
-    }
-
-    //    @Cacheable(value = "getChildrenByParentId", key = "#id")
-    public OrgDto getChildrenByParentId(Long id, Company company) {
-        if (id == null) {
-            return null;
-        }
-        Feature feature = getFeatureById(id);
-        if (feature == null) {
-            return null;
-        }
-        //创建OrgDto节点
-        OrgDto orgDto = new OrgDto();
-        orgDto.setId(id); //保存ID信息
-        orgDto.setName(feature.getFeatureName());
-        if (feature.getParent() != null) {
-            orgDto.setParentId(feature.getParent().getId());
-        }
-        List<Feature> departments = this.getActiveChildrenOrgs(feature, company);
-        for (Feature fea : departments) {
-            orgDto.getChildren().add(this.getChildrenByParentId(fea.getId(), company));
-        }
-        return orgDto;
-    }
-
-    //    @Cacheable(value = "getActiveChildrenOrgs", key = "#department.getId()")
-    private List<Feature> getActiveChildrenOrgs(Feature department, Company company) {
-        List<Feature> features = new ArrayList<Feature>();
-        for (Feature feature : department.getChildren()) {
-            if (feature.isValid() == 1 && feature.getCompany().getId().equals(company.getId())) {
-                features.add(feature);
-            }
-        }
-        return features;
-    }
-
-
-    public List<Feature> getRootFeatures(Integer type) {
-        List<Feature> features = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("type", type)).add(Restrictions.isNull("parent"));
-            features = criteria.list();
-        } catch (Exception e) {
-            return Collections.emptyList();
-        }
-        return features;
-
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param company 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByCompany", key = "#company.getId()")
-    public List<Feature> getFeaturesByCompany(Company company) {
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-        criteria.add(Restrictions.eq("company", company));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-
-        for (Feature f : features) {
-            f.getChildren().toString();
-            f.getOwner().toString();
-            if (f.getParent() != null)
-                f.getParent().toString();
-        }
-        return features;
-    }
-
-    /**
-     * 根据组织结构的id获取叶子节点
-     ***重要：**已更改为包含本节点****
-     * @param type
-     * @param feature
-     * @return
-     */
-    public List<Feature> getLeafByParentId(Integer type, Feature feature) {
-        if (feature == null || feature.isValid() == 0) return Collections.emptyList();
-        List<Feature> features = new ArrayList<Feature>();
-        if (CollectionUtils.isEmpty(feature.getChildren())) {
-            features.add(feature);
-            return features;
-        }
-        List<Feature> children = feature.getChildren();
-        boolean flag = false;
-        for (Feature child : children) {
-            if (child.isValid() == 1) {
-                flag = true;
-                features.addAll(getLeafByParentId(type, child));
-            }
-        }
-//        if (!flag) {//没有有效的子节点
-            features.add(feature);
-//        }
-        return features;
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java b/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
deleted file mode 100644
index a706a36..0000000
--- a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package com.casic.accessControl.feature.web;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.Role;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.CompanyManager;
-import com.casic.accessControl.user.manager.UserManager;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.StringUtils;
-import com.casic.accessControl.xls.Common;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import sun.org.mozilla.javascript.internal.EcmaError;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.IOException;
-import java.util.*;
-
-/**
- * 提供http访问接口
- * Created by lenovo on 2016/5/16.
- */
-@Controller
-@RequestMapping(value = "feature")
-public class FeatureController {
-    @Autowired
-    private FeatureManager featureManager;
-    @Autowired
-    private UserManager userManager;
-    @Autowired
-    private CompanyManager companyManager;
-
-    @RequestMapping(value = "org-list")
-    @ResponseBody
-    public String getOrgList(@RequestParam(required = true) Integer type, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Company company = user.getCompany();
-        return featureManager.getOrgList(type, company);
-    }
-
-    @RequestMapping(value = "org-list-na")
-    @ResponseBody
-    public Map<String, String> getOrgListNa(@RequestParam Long userId) {//na端所有传过来的userid都是公司id
-        Map<String, String> res = new HashMap<String, String>();
-        res.put("message", "列表获取失败");
-        try {
-//            User user = userManager.getUserById(userId);//获取当前登录用户
-//            Company company = user.getCompany();
-            Company company = companyManager.getCompanyById(userId);
-            String areas = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.AREA.getIndex(), company);
-            String lines = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.LINE.getIndex(), company);
-            res.put("feature", areas);
-            res.put("line", lines);
-        } catch (Exception e) {
-            return res;
-        }
-        res.put("message", "成功获取");
-        return res;
-    }
-
-    @RequestMapping(value = "getFeature")
-    @ResponseBody
-    public Map<String, Object> getFeaturesByUser(@RequestParam(required = true) Integer type, HttpSession session) {
-
-        Map<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        List<FeatureDto> list = featureManager.getFeaturesByUser(type, user);
-        if (list == null) {//获取列表失败
-            result.put("message", "获取列表出现错误");
-            return result;
-        } else {
-            result.put("data", list);
-            result.put("message", "获取列表成功");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "getSubFeatureList")
-    public void getSubFeatureList(@RequestParam(required = true) String jsonParams, @RequestParam(required = false) Long parentId, HttpServletResponse response, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Feature parent = featureManager.getFeatureById(parentId);
-        DataTable<FeatureDto> dtoDataTable = featureManager.getPageFeatureListByTye(jsonParams, parent, user);
-        Gson gson = new Gson();
-        String json = gson.toJson(dtoDataTable);
-        response.setCharacterEncoding("utf-8");
-        try {
-            response.getWriter().write(json);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @RequestMapping(value = "delete")
-    @ResponseBody
-    public Map<String, Object> deleteFeatureById(@RequestParam(required = true) Long id, HttpSession session) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        try {
-            String res = featureManager.invalidFeature(id.toString());
-            if (StringUtils.isBlank(res)) {
-                result.put("message", "删除失败");
-            } else {
-                result.put("message", "删除成功");
-                result.put("success", true);
-            }
-        } catch (Exception e) {
-            result.put("message", "删除失败");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "save")
-    @ResponseBody
-    public Map<String, Object> save(@RequestParam(required = true) String params, HttpSession session) {
-        Gson gson = new Gson();
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        Map markers = gson.fromJson(params, HashMap.class);
-        String featureName = (String) markers.get("featureName");
-        String memo = (String) markers.get("memo") == null ? "" : (String) markers.get("memo");
-        Long parentId = Long.valueOf(StringUtils.isBlank((String) markers.get("parentId")) ? "-1" : (String) markers.get("parentId"));//不知为什么转过来为Double
-        Long id = Long.valueOf(StringUtils.isBlank((String) markers.get("id")) ? "-1" : (String) markers.get("id"));
-
-
-        if (StringUtils.isBlank(featureName) || parentId.equals(-1L)) {
-            result.put("message", "必要参数未传送");
-            return result;
-        }
-        Feature feature = new Feature();
-        feature.setValid(1);
-        Feature parent = featureManager.getFeatureById(parentId);
-        feature.setParent(parent);
-        feature.setFeatureName(featureName);
-        feature.setMemo(memo);
-        feature.setOwner(user);
-        feature.setCompany(user.getCompany());
-        feature.setType(parent.getType());
-        if (!id.equals(-1L)) {
-            feature.setId(id);
-        }
-        try {
-            featureManager.saveOrupdateFeature(feature, user);
-            result.put("message", "保存成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "保存失败");
-        }
-        return result;
-
-    }
-
-
-    @RequestMapping(value = "getFeatureById")
-    @ResponseBody
-    public Map<String, Object> getFeatureById(@RequestParam(required = true) Long id) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        try {
-            FeatureDto feature = featureManager.getFeatureDtoById(id);
-            result.put("data", feature);
-            result.put("message", "获取成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "获取失败");
-        }
-        return result;
-
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
index 08a290e..3f53635 100644
--- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
+++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
@@ -1,6 +1,6 @@
 package com.casic.accessControl.marker.dto;
 
-import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.domain.Feature;
 import com.casic.accessControl.marker.domain.Marker;
 import org.apache.commons.collections.CollectionUtils;
 
diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
index 080b291..7fe7434 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -4,8 +4,6 @@
 import com.casic.accessControl.core.hibernate.HibernateEntityDao;
 import com.casic.accessControl.core.page.Page;
 import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.user.domain.Company;
@@ -49,9 +47,6 @@
 public class MarkerManager extends HibernateEntityDao<Marker> {
 
     @Resource
-    private FeatureManager featureManager;
-
-    @Resource
     private UserManager userInfoManager;
 
 
@@ -154,33 +149,33 @@
 
     //获取marker
 //    @Cacheable(value = "getMarkerByFeature", key = "#feature.getId()")
-    public List<Marker> getMarkerByFeature(Feature feature) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            criteria.add(Restrictions.eq("belongLine", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            criteria.add(Restrictions.eq("belongLine", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
-    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
-            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
+//            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
     public boolean saveMarker(Marker marker) {
         try {
@@ -465,7 +460,7 @@
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setLayStyle(sheet.getCell(indexMap.get("layStyle"), i).getContents());
-                } else if(recordTypeFlag == 4) {
+                } else if (recordTypeFlag == 4) {
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setBelowType(sheet.getCell(indexMap.get("belowType"), i).getContents());
diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
index a19f2f5..7675e1f 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -2,9 +2,6 @@
 
 import com.casic.accessControl.core.ext.export.CsvExportor;
 import com.casic.accessControl.core.ext.export.TableModel;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.manager.MarkerManager;

diff --git a/src/main/java/com/casic/accessControl/feature/domain/Feature.java b/src/main/java/com/casic/accessControl/feature/domain/Feature.java
deleted file mode 100644
index c89a0c2..0000000
--- a/src/main/java/com/casic/accessControl/feature/domain/Feature.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.casic.accessControl.feature.domain;
-
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-
-import javax.persistence.*;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-//点的信息
-@Entity
-@Table(name = "feature")
-public class Feature {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private Long id;
-    @Column(name = "longitude")
-    private Double longitude;
-    @Column(name = "latitude")
-    private Double latitude;
-    @Column(name = "featureName")
-    private String featureName;
-    @Column(name = "type")
-    private int type;
-    @Column(name = "isValid")
-    private Integer isValid;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "parent")
-    private Feature parent;
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "parent")
-    private List<Feature> children;
-    @Column(name = "memo")
-    private String memo;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "owner", referencedColumnName = "id")
-    private User owner;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "company", referencedColumnName = "id")
-    private Company company;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer isValid() {
-        return isValid;
-    }
-
-    public void setValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public Feature getParent() {
-        return parent;
-    }
-
-    public void setParent(Feature parent) {
-        this.parent = parent;
-    }
-
-    public List<Feature> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<Feature> children) {
-        this.children = children;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public User getOwner() {
-        return owner;
-    }
-
-    public void setOwner(User owner) {
-        this.owner = owner;
-    }
-
-    public Company getCompany() {
-        return company;
-    }
-
-    public void setCompany(Company company) {
-        this.company = company;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java b/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
deleted file mode 100644
index 256f261..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import com.casic.accessControl.feature.domain.Feature;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/17.
- */
-public class FeatureDto {
-    private Long id;
-    private Double longitude;
-    private Double latitude;
-    private String featureName;
-    private int type;
-    private Integer isValid;
-    private String memo;
-    private Long parentId;
-
-    private String btnEdit = "<a href='#' class='btn mini blue'><i class='icon-edit'></i>编辑</a>";
-    private String btnDelete = "<a href='#' class='btn mini red'><i class='icon-trash'></i>删除</a>";
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer getIsValid() {
-        return isValid;
-    }
-
-    public void setIsValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public Long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getBtnEdit() {
-        return btnEdit;
-    }
-
-    public void setBtnEdit(String btnEdit) {
-        this.btnEdit = btnEdit;
-    }
-
-    public String getBtnDelete() {
-        return btnDelete;
-    }
-
-    public void setBtnDelete(String btnDelete) {
-        this.btnDelete = btnDelete;
-    }
-
-    public static FeatureDto convert2FeatureDto(Feature feature) {
-        if (feature == null) {
-            return null;
-        }
-        FeatureDto featureDto = new FeatureDto();
-        featureDto.setId(feature.getId());
-        featureDto.setFeatureName(feature.getFeatureName());
-        featureDto.setIsValid(feature.isValid());
-        featureDto.setLatitude(feature.getLatitude());
-        featureDto.setLongitude(feature.getLongitude());
-        featureDto.setMemo(feature.getMemo());
-        featureDto.setType(feature.getType());
-        if (feature.getParent() != null)
-            featureDto.setParentId(feature.getParent().getId());
-        return featureDto;
-    }
-
-    public static List<FeatureDto> convert2FeatureDtos(List<Feature> features) {
-        List<FeatureDto> featureDtos = new ArrayList<FeatureDto>();
-        for (Feature feature : features) {
-            featureDtos.add(convert2FeatureDto(feature));
-        }
-        return featureDtos;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java b/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
deleted file mode 100644
index 785dcba..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/19.
- */
-public class OrgDto {
-    private long id;
-
-    private String name;
-
-    private long parentId;
-
-    private List<OrgDto> children = new ArrayList<OrgDto>();
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(long parentId) {
-        this.parentId = parentId;
-    }
-
-    public List<OrgDto> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<OrgDto> children) {
-        this.children = children;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java b/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
deleted file mode 100644
index a475e21..0000000
--- a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
+++ /dev/null
@@ -1,316 +0,0 @@
-package com.casic.accessControl.feature.manager;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.core.page.Page;
-import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.marker.manager.MarkerManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.DataTableParameter;
-import com.casic.accessControl.util.DataTableUtils;
-import org.apache.commons.collections.CollectionUtils;
-import org.hibernate.Criteria;
-import org.hibernate.Query;
-import org.hibernate.criterion.Restrictions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.jdbc.object.SqlQuery;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-@Service
-public class FeatureManager extends HibernateEntityDao<Feature> {
-
-    private Logger logger = LoggerFactory.getLogger(this.getClass());
-    @Resource
-    private MarkerManager markerManager;
-
-
-    public Feature getFeatureById(Long id) {
-        Feature feature = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("id", id)).add(Restrictions.eq("isValid", 1));
-            feature = (Feature) criteria.list().get(0);
-        } catch (Exception e) {
-            return null;
-        }
-        return feature;
-    }
-
-    public FeatureDto getFeatureDtoById(Long id) {
-        return FeatureDto.convert2FeatureDto(getFeatureById(id));
-    }
-
-    /**
-     * 根据id，软删除某个点或线或片
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param ids 多个id
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public String invalidFeature(String ids) {
-        if (StringUtils.isBlank(ids) || ids.indexOf(")") != -1) {//未传入值，直接返回，防止无效查询,过滤非法请求，防止sql注入
-            return "";
-        }
-        String[] idsArr = ids.split(",");
-        StringBuilder canDeleteIds = new StringBuilder("");
-        StringBuilder cantDeleleIds = new StringBuilder("");
-        //找出能删除的和不能删除的id组合
-        for (String id : idsArr) {
-            Long longId = Long.valueOf(id);
-            if (this.isCanDelete(longId)) {
-                if (canDeleteIds.length() > 0) {
-                    canDeleteIds.append(",");
-                }
-                canDeleteIds.append(id);
-
-            } else {
-                if (cantDeleleIds.length() > 0) {
-                    cantDeleleIds.append(",");
-                }
-                cantDeleleIds.append(id);
-            }
-        }
-
-        String temp1Ids = canDeleteIds.toString();
-        String temp2Ids = cantDeleleIds.toString();
-        if (StringUtils.isNotBlank(temp2Ids)) {//有不能删除的，都不删除
-            return "";
-        }
-        Query query = this.getSession().createQuery("update Feature f set f.isValid = 0 where id in (" + temp1Ids + ")");
-        query.executeUpdate();
-
-        return "success";
-    }
-
-    /**
-     * 判断feature是否可以删除
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param id
-     * @return
-     */
-    private boolean isCanDelete(Long id) {
-        Feature feature = this.getFeatureById(id);
-        if (feature.getParent() == null) {//所有用户共用的根节点不能删除
-            return false;
-        }
-        if (CollectionUtils.isNotEmpty(feature.getChildren())) {
-            for (Feature child : feature.getChildren()) {
-                if (child.isValid() == 1) {
-                    return false;
-                }
-            }
-
-        }
-        List<Marker> markers = markerManager.getMarkerByFeature(feature);
-        if (CollectionUtils.isNotEmpty(markers)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * 将数据库中的feature信息按照参数更新
-     *
-     * @param feature
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public void saveOrupdateFeature(Feature feature, User user) {
-        this.getSession().saveOrUpdate(feature);
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param user 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByUser")
-    public List<FeatureDto> getFeaturesByUser(Integer type, User user) {
-        if (user == null) {
-            return Collections.emptyList();
-        }
-        Company company = user.getCompany();
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("type", type));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-        return FeatureDto.convert2FeatureDtos(features);
-    }
-
-    /**
-     * 分页使用，datatable获取相应type的feature某页数据
-     *
-     * @param params
-     * @param user
-     * @return
-     */
-    public DataTable<FeatureDto> getPageFeatureListByTye(String params, Feature parent, User user) {
-        DataTable<FeatureDto> result = new DataTable<FeatureDto>();
-        DataTableParameter parameter = DataTableUtils.getDataTableParameterByJsonParam(params);
-        int start = parameter.getiDisplayStart();
-        int pageSize = parameter.getiDisplayLength();
-        int pageNo = (start / pageSize) + 1;
-        Criteria criteria = this.createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        Company company = user.getCompany();
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("isValid", 1)).add(Restrictions.eq("parent", parent));
-        Page page = pagedQuery(criteria, pageNo, pageSize);
-        List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos((List<Feature>) page.getResult());
-        result.setAaData(featureDtos);
-        result.setiTotalDisplayRecords((int) page.getTotalCount());
-        result.setiTotalRecords((int) page.getTotalCount());
-        result.setsEcho(parameter.getsEcho());
-        return result;
-
-
-    }
-
-    /**
-     * 获取层次结构列表,增加缓存
-     *
-     * @param type
-     * @param company
-     * @return
-     */
-    @Cacheable(value = "getOrgList")
-    public String getOrgList(Integer type, Company company) {
-        List<OrgDto> orgDtos = new ArrayList<OrgDto>();
-        List<Feature> features = this.getRootFeatures(type);
-        for (Feature feature : features) {
-            orgDtos.add(this.getChildrenByParentId(feature.getId(), company));
-        }
-        String jsonStr = null;
-        try {
-            jsonStr = new JsonMapper().toJson(orgDtos);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return jsonStr;
-    }
-
-    //    @Cacheable(value = "getChildrenByParentId", key = "#id")
-    public OrgDto getChildrenByParentId(Long id, Company company) {
-        if (id == null) {
-            return null;
-        }
-        Feature feature = getFeatureById(id);
-        if (feature == null) {
-            return null;
-        }
-        //创建OrgDto节点
-        OrgDto orgDto = new OrgDto();
-        orgDto.setId(id); //保存ID信息
-        orgDto.setName(feature.getFeatureName());
-        if (feature.getParent() != null) {
-            orgDto.setParentId(feature.getParent().getId());
-        }
-        List<Feature> departments = this.getActiveChildrenOrgs(feature, company);
-        for (Feature fea : departments) {
-            orgDto.getChildren().add(this.getChildrenByParentId(fea.getId(), company));
-        }
-        return orgDto;
-    }
-
-    //    @Cacheable(value = "getActiveChildrenOrgs", key = "#department.getId()")
-    private List<Feature> getActiveChildrenOrgs(Feature department, Company company) {
-        List<Feature> features = new ArrayList<Feature>();
-        for (Feature feature : department.getChildren()) {
-            if (feature.isValid() == 1 && feature.getCompany().getId().equals(company.getId())) {
-                features.add(feature);
-            }
-        }
-        return features;
-    }
-
-
-    public List<Feature> getRootFeatures(Integer type) {
-        List<Feature> features = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("type", type)).add(Restrictions.isNull("parent"));
-            features = criteria.list();
-        } catch (Exception e) {
-            return Collections.emptyList();
-        }
-        return features;
-
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param company 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByCompany", key = "#company.getId()")
-    public List<Feature> getFeaturesByCompany(Company company) {
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-        criteria.add(Restrictions.eq("company", company));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-
-        for (Feature f : features) {
-            f.getChildren().toString();
-            f.getOwner().toString();
-            if (f.getParent() != null)
-                f.getParent().toString();
-        }
-        return features;
-    }
-
-    /**
-     * 根据组织结构的id获取叶子节点
-     ***重要：**已更改为包含本节点****
-     * @param type
-     * @param feature
-     * @return
-     */
-    public List<Feature> getLeafByParentId(Integer type, Feature feature) {
-        if (feature == null || feature.isValid() == 0) return Collections.emptyList();
-        List<Feature> features = new ArrayList<Feature>();
-        if (CollectionUtils.isEmpty(feature.getChildren())) {
-            features.add(feature);
-            return features;
-        }
-        List<Feature> children = feature.getChildren();
-        boolean flag = false;
-        for (Feature child : children) {
-            if (child.isValid() == 1) {
-                flag = true;
-                features.addAll(getLeafByParentId(type, child));
-            }
-        }
-//        if (!flag) {//没有有效的子节点
-            features.add(feature);
-//        }
-        return features;
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java b/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
deleted file mode 100644
index a706a36..0000000
--- a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package com.casic.accessControl.feature.web;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.Role;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.CompanyManager;
-import com.casic.accessControl.user.manager.UserManager;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.StringUtils;
-import com.casic.accessControl.xls.Common;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import sun.org.mozilla.javascript.internal.EcmaError;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.IOException;
-import java.util.*;
-
-/**
- * 提供http访问接口
- * Created by lenovo on 2016/5/16.
- */
-@Controller
-@RequestMapping(value = "feature")
-public class FeatureController {
-    @Autowired
-    private FeatureManager featureManager;
-    @Autowired
-    private UserManager userManager;
-    @Autowired
-    private CompanyManager companyManager;
-
-    @RequestMapping(value = "org-list")
-    @ResponseBody
-    public String getOrgList(@RequestParam(required = true) Integer type, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Company company = user.getCompany();
-        return featureManager.getOrgList(type, company);
-    }
-
-    @RequestMapping(value = "org-list-na")
-    @ResponseBody
-    public Map<String, String> getOrgListNa(@RequestParam Long userId) {//na端所有传过来的userid都是公司id
-        Map<String, String> res = new HashMap<String, String>();
-        res.put("message", "列表获取失败");
-        try {
-//            User user = userManager.getUserById(userId);//获取当前登录用户
-//            Company company = user.getCompany();
-            Company company = companyManager.getCompanyById(userId);
-            String areas = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.AREA.getIndex(), company);
-            String lines = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.LINE.getIndex(), company);
-            res.put("feature", areas);
-            res.put("line", lines);
-        } catch (Exception e) {
-            return res;
-        }
-        res.put("message", "成功获取");
-        return res;
-    }
-
-    @RequestMapping(value = "getFeature")
-    @ResponseBody
-    public Map<String, Object> getFeaturesByUser(@RequestParam(required = true) Integer type, HttpSession session) {
-
-        Map<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        List<FeatureDto> list = featureManager.getFeaturesByUser(type, user);
-        if (list == null) {//获取列表失败
-            result.put("message", "获取列表出现错误");
-            return result;
-        } else {
-            result.put("data", list);
-            result.put("message", "获取列表成功");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "getSubFeatureList")
-    public void getSubFeatureList(@RequestParam(required = true) String jsonParams, @RequestParam(required = false) Long parentId, HttpServletResponse response, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Feature parent = featureManager.getFeatureById(parentId);
-        DataTable<FeatureDto> dtoDataTable = featureManager.getPageFeatureListByTye(jsonParams, parent, user);
-        Gson gson = new Gson();
-        String json = gson.toJson(dtoDataTable);
-        response.setCharacterEncoding("utf-8");
-        try {
-            response.getWriter().write(json);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @RequestMapping(value = "delete")
-    @ResponseBody
-    public Map<String, Object> deleteFeatureById(@RequestParam(required = true) Long id, HttpSession session) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        try {
-            String res = featureManager.invalidFeature(id.toString());
-            if (StringUtils.isBlank(res)) {
-                result.put("message", "删除失败");
-            } else {
-                result.put("message", "删除成功");
-                result.put("success", true);
-            }
-        } catch (Exception e) {
-            result.put("message", "删除失败");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "save")
-    @ResponseBody
-    public Map<String, Object> save(@RequestParam(required = true) String params, HttpSession session) {
-        Gson gson = new Gson();
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        Map markers = gson.fromJson(params, HashMap.class);
-        String featureName = (String) markers.get("featureName");
-        String memo = (String) markers.get("memo") == null ? "" : (String) markers.get("memo");
-        Long parentId = Long.valueOf(StringUtils.isBlank((String) markers.get("parentId")) ? "-1" : (String) markers.get("parentId"));//不知为什么转过来为Double
-        Long id = Long.valueOf(StringUtils.isBlank((String) markers.get("id")) ? "-1" : (String) markers.get("id"));
-
-
-        if (StringUtils.isBlank(featureName) || parentId.equals(-1L)) {
-            result.put("message", "必要参数未传送");
-            return result;
-        }
-        Feature feature = new Feature();
-        feature.setValid(1);
-        Feature parent = featureManager.getFeatureById(parentId);
-        feature.setParent(parent);
-        feature.setFeatureName(featureName);
-        feature.setMemo(memo);
-        feature.setOwner(user);
-        feature.setCompany(user.getCompany());
-        feature.setType(parent.getType());
-        if (!id.equals(-1L)) {
-            feature.setId(id);
-        }
-        try {
-            featureManager.saveOrupdateFeature(feature, user);
-            result.put("message", "保存成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "保存失败");
-        }
-        return result;
-
-    }
-
-
-    @RequestMapping(value = "getFeatureById")
-    @ResponseBody
-    public Map<String, Object> getFeatureById(@RequestParam(required = true) Long id) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        try {
-            FeatureDto feature = featureManager.getFeatureDtoById(id);
-            result.put("data", feature);
-            result.put("message", "获取成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "获取失败");
-        }
-        return result;
-
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
index 08a290e..3f53635 100644
--- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
+++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
@@ -1,6 +1,6 @@
 package com.casic.accessControl.marker.dto;
 
-import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.domain.Feature;
 import com.casic.accessControl.marker.domain.Marker;
 import org.apache.commons.collections.CollectionUtils;
 
diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
index 080b291..7fe7434 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -4,8 +4,6 @@
 import com.casic.accessControl.core.hibernate.HibernateEntityDao;
 import com.casic.accessControl.core.page.Page;
 import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.user.domain.Company;
@@ -49,9 +47,6 @@
 public class MarkerManager extends HibernateEntityDao<Marker> {
 
     @Resource
-    private FeatureManager featureManager;
-
-    @Resource
     private UserManager userInfoManager;
 
 
@@ -154,33 +149,33 @@
 
     //获取marker
 //    @Cacheable(value = "getMarkerByFeature", key = "#feature.getId()")
-    public List<Marker> getMarkerByFeature(Feature feature) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            criteria.add(Restrictions.eq("belongLine", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            criteria.add(Restrictions.eq("belongLine", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
-    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
-            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
+//            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
     public boolean saveMarker(Marker marker) {
         try {
@@ -465,7 +460,7 @@
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setLayStyle(sheet.getCell(indexMap.get("layStyle"), i).getContents());
-                } else if(recordTypeFlag == 4) {
+                } else if (recordTypeFlag == 4) {
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setBelowType(sheet.getCell(indexMap.get("belowType"), i).getContents());
diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
index a19f2f5..7675e1f 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -2,9 +2,6 @@
 
 import com.casic.accessControl.core.ext.export.CsvExportor;
 import com.casic.accessControl.core.ext.export.TableModel;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.manager.MarkerManager;
diff --git a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java b/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
deleted file mode 100644
index e69de29..0000000
--- a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
+++ /dev/null

diff --git a/src/main/java/com/casic/accessControl/feature/domain/Feature.java b/src/main/java/com/casic/accessControl/feature/domain/Feature.java
deleted file mode 100644
index c89a0c2..0000000
--- a/src/main/java/com/casic/accessControl/feature/domain/Feature.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.casic.accessControl.feature.domain;
-
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-
-import javax.persistence.*;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-//点的信息
-@Entity
-@Table(name = "feature")
-public class Feature {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private Long id;
-    @Column(name = "longitude")
-    private Double longitude;
-    @Column(name = "latitude")
-    private Double latitude;
-    @Column(name = "featureName")
-    private String featureName;
-    @Column(name = "type")
-    private int type;
-    @Column(name = "isValid")
-    private Integer isValid;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "parent")
-    private Feature parent;
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "parent")
-    private List<Feature> children;
-    @Column(name = "memo")
-    private String memo;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "owner", referencedColumnName = "id")
-    private User owner;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "company", referencedColumnName = "id")
-    private Company company;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer isValid() {
-        return isValid;
-    }
-
-    public void setValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public Feature getParent() {
-        return parent;
-    }
-
-    public void setParent(Feature parent) {
-        this.parent = parent;
-    }
-
-    public List<Feature> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<Feature> children) {
-        this.children = children;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public User getOwner() {
-        return owner;
-    }
-
-    public void setOwner(User owner) {
-        this.owner = owner;
-    }
-
-    public Company getCompany() {
-        return company;
-    }
-
-    public void setCompany(Company company) {
-        this.company = company;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java b/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
deleted file mode 100644
index 256f261..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import com.casic.accessControl.feature.domain.Feature;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/17.
- */
-public class FeatureDto {
-    private Long id;
-    private Double longitude;
-    private Double latitude;
-    private String featureName;
-    private int type;
-    private Integer isValid;
-    private String memo;
-    private Long parentId;
-
-    private String btnEdit = "<a href='#' class='btn mini blue'><i class='icon-edit'></i>编辑</a>";
-    private String btnDelete = "<a href='#' class='btn mini red'><i class='icon-trash'></i>删除</a>";
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer getIsValid() {
-        return isValid;
-    }
-
-    public void setIsValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public Long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getBtnEdit() {
-        return btnEdit;
-    }
-
-    public void setBtnEdit(String btnEdit) {
-        this.btnEdit = btnEdit;
-    }
-
-    public String getBtnDelete() {
-        return btnDelete;
-    }
-
-    public void setBtnDelete(String btnDelete) {
-        this.btnDelete = btnDelete;
-    }
-
-    public static FeatureDto convert2FeatureDto(Feature feature) {
-        if (feature == null) {
-            return null;
-        }
-        FeatureDto featureDto = new FeatureDto();
-        featureDto.setId(feature.getId());
-        featureDto.setFeatureName(feature.getFeatureName());
-        featureDto.setIsValid(feature.isValid());
-        featureDto.setLatitude(feature.getLatitude());
-        featureDto.setLongitude(feature.getLongitude());
-        featureDto.setMemo(feature.getMemo());
-        featureDto.setType(feature.getType());
-        if (feature.getParent() != null)
-            featureDto.setParentId(feature.getParent().getId());
-        return featureDto;
-    }
-
-    public static List<FeatureDto> convert2FeatureDtos(List<Feature> features) {
-        List<FeatureDto> featureDtos = new ArrayList<FeatureDto>();
-        for (Feature feature : features) {
-            featureDtos.add(convert2FeatureDto(feature));
-        }
-        return featureDtos;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java b/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
deleted file mode 100644
index 785dcba..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/19.
- */
-public class OrgDto {
-    private long id;
-
-    private String name;
-
-    private long parentId;
-
-    private List<OrgDto> children = new ArrayList<OrgDto>();
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(long parentId) {
-        this.parentId = parentId;
-    }
-
-    public List<OrgDto> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<OrgDto> children) {
-        this.children = children;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java b/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
deleted file mode 100644
index a475e21..0000000
--- a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
+++ /dev/null
@@ -1,316 +0,0 @@
-package com.casic.accessControl.feature.manager;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.core.page.Page;
-import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.marker.manager.MarkerManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.DataTableParameter;
-import com.casic.accessControl.util.DataTableUtils;
-import org.apache.commons.collections.CollectionUtils;
-import org.hibernate.Criteria;
-import org.hibernate.Query;
-import org.hibernate.criterion.Restrictions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.jdbc.object.SqlQuery;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-@Service
-public class FeatureManager extends HibernateEntityDao<Feature> {
-
-    private Logger logger = LoggerFactory.getLogger(this.getClass());
-    @Resource
-    private MarkerManager markerManager;
-
-
-    public Feature getFeatureById(Long id) {
-        Feature feature = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("id", id)).add(Restrictions.eq("isValid", 1));
-            feature = (Feature) criteria.list().get(0);
-        } catch (Exception e) {
-            return null;
-        }
-        return feature;
-    }
-
-    public FeatureDto getFeatureDtoById(Long id) {
-        return FeatureDto.convert2FeatureDto(getFeatureById(id));
-    }
-
-    /**
-     * 根据id，软删除某个点或线或片
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param ids 多个id
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public String invalidFeature(String ids) {
-        if (StringUtils.isBlank(ids) || ids.indexOf(")") != -1) {//未传入值，直接返回，防止无效查询,过滤非法请求，防止sql注入
-            return "";
-        }
-        String[] idsArr = ids.split(",");
-        StringBuilder canDeleteIds = new StringBuilder("");
-        StringBuilder cantDeleleIds = new StringBuilder("");
-        //找出能删除的和不能删除的id组合
-        for (String id : idsArr) {
-            Long longId = Long.valueOf(id);
-            if (this.isCanDelete(longId)) {
-                if (canDeleteIds.length() > 0) {
-                    canDeleteIds.append(",");
-                }
-                canDeleteIds.append(id);
-
-            } else {
-                if (cantDeleleIds.length() > 0) {
-                    cantDeleleIds.append(",");
-                }
-                cantDeleleIds.append(id);
-            }
-        }
-
-        String temp1Ids = canDeleteIds.toString();
-        String temp2Ids = cantDeleleIds.toString();
-        if (StringUtils.isNotBlank(temp2Ids)) {//有不能删除的，都不删除
-            return "";
-        }
-        Query query = this.getSession().createQuery("update Feature f set f.isValid = 0 where id in (" + temp1Ids + ")");
-        query.executeUpdate();
-
-        return "success";
-    }
-
-    /**
-     * 判断feature是否可以删除
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param id
-     * @return
-     */
-    private boolean isCanDelete(Long id) {
-        Feature feature = this.getFeatureById(id);
-        if (feature.getParent() == null) {//所有用户共用的根节点不能删除
-            return false;
-        }
-        if (CollectionUtils.isNotEmpty(feature.getChildren())) {
-            for (Feature child : feature.getChildren()) {
-                if (child.isValid() == 1) {
-                    return false;
-                }
-            }
-
-        }
-        List<Marker> markers = markerManager.getMarkerByFeature(feature);
-        if (CollectionUtils.isNotEmpty(markers)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * 将数据库中的feature信息按照参数更新
-     *
-     * @param feature
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public void saveOrupdateFeature(Feature feature, User user) {
-        this.getSession().saveOrUpdate(feature);
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param user 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByUser")
-    public List<FeatureDto> getFeaturesByUser(Integer type, User user) {
-        if (user == null) {
-            return Collections.emptyList();
-        }
-        Company company = user.getCompany();
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("type", type));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-        return FeatureDto.convert2FeatureDtos(features);
-    }
-
-    /**
-     * 分页使用，datatable获取相应type的feature某页数据
-     *
-     * @param params
-     * @param user
-     * @return
-     */
-    public DataTable<FeatureDto> getPageFeatureListByTye(String params, Feature parent, User user) {
-        DataTable<FeatureDto> result = new DataTable<FeatureDto>();
-        DataTableParameter parameter = DataTableUtils.getDataTableParameterByJsonParam(params);
-        int start = parameter.getiDisplayStart();
-        int pageSize = parameter.getiDisplayLength();
-        int pageNo = (start / pageSize) + 1;
-        Criteria criteria = this.createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        Company company = user.getCompany();
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("isValid", 1)).add(Restrictions.eq("parent", parent));
-        Page page = pagedQuery(criteria, pageNo, pageSize);
-        List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos((List<Feature>) page.getResult());
-        result.setAaData(featureDtos);
-        result.setiTotalDisplayRecords((int) page.getTotalCount());
-        result.setiTotalRecords((int) page.getTotalCount());
-        result.setsEcho(parameter.getsEcho());
-        return result;
-
-
-    }
-
-    /**
-     * 获取层次结构列表,增加缓存
-     *
-     * @param type
-     * @param company
-     * @return
-     */
-    @Cacheable(value = "getOrgList")
-    public String getOrgList(Integer type, Company company) {
-        List<OrgDto> orgDtos = new ArrayList<OrgDto>();
-        List<Feature> features = this.getRootFeatures(type);
-        for (Feature feature : features) {
-            orgDtos.add(this.getChildrenByParentId(feature.getId(), company));
-        }
-        String jsonStr = null;
-        try {
-            jsonStr = new JsonMapper().toJson(orgDtos);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return jsonStr;
-    }
-
-    //    @Cacheable(value = "getChildrenByParentId", key = "#id")
-    public OrgDto getChildrenByParentId(Long id, Company company) {
-        if (id == null) {
-            return null;
-        }
-        Feature feature = getFeatureById(id);
-        if (feature == null) {
-            return null;
-        }
-        //创建OrgDto节点
-        OrgDto orgDto = new OrgDto();
-        orgDto.setId(id); //保存ID信息
-        orgDto.setName(feature.getFeatureName());
-        if (feature.getParent() != null) {
-            orgDto.setParentId(feature.getParent().getId());
-        }
-        List<Feature> departments = this.getActiveChildrenOrgs(feature, company);
-        for (Feature fea : departments) {
-            orgDto.getChildren().add(this.getChildrenByParentId(fea.getId(), company));
-        }
-        return orgDto;
-    }
-
-    //    @Cacheable(value = "getActiveChildrenOrgs", key = "#department.getId()")
-    private List<Feature> getActiveChildrenOrgs(Feature department, Company company) {
-        List<Feature> features = new ArrayList<Feature>();
-        for (Feature feature : department.getChildren()) {
-            if (feature.isValid() == 1 && feature.getCompany().getId().equals(company.getId())) {
-                features.add(feature);
-            }
-        }
-        return features;
-    }
-
-
-    public List<Feature> getRootFeatures(Integer type) {
-        List<Feature> features = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("type", type)).add(Restrictions.isNull("parent"));
-            features = criteria.list();
-        } catch (Exception e) {
-            return Collections.emptyList();
-        }
-        return features;
-
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param company 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByCompany", key = "#company.getId()")
-    public List<Feature> getFeaturesByCompany(Company company) {
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-        criteria.add(Restrictions.eq("company", company));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-
-        for (Feature f : features) {
-            f.getChildren().toString();
-            f.getOwner().toString();
-            if (f.getParent() != null)
-                f.getParent().toString();
-        }
-        return features;
-    }
-
-    /**
-     * 根据组织结构的id获取叶子节点
-     ***重要：**已更改为包含本节点****
-     * @param type
-     * @param feature
-     * @return
-     */
-    public List<Feature> getLeafByParentId(Integer type, Feature feature) {
-        if (feature == null || feature.isValid() == 0) return Collections.emptyList();
-        List<Feature> features = new ArrayList<Feature>();
-        if (CollectionUtils.isEmpty(feature.getChildren())) {
-            features.add(feature);
-            return features;
-        }
-        List<Feature> children = feature.getChildren();
-        boolean flag = false;
-        for (Feature child : children) {
-            if (child.isValid() == 1) {
-                flag = true;
-                features.addAll(getLeafByParentId(type, child));
-            }
-        }
-//        if (!flag) {//没有有效的子节点
-            features.add(feature);
-//        }
-        return features;
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java b/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
deleted file mode 100644
index a706a36..0000000
--- a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package com.casic.accessControl.feature.web;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.Role;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.CompanyManager;
-import com.casic.accessControl.user.manager.UserManager;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.StringUtils;
-import com.casic.accessControl.xls.Common;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import sun.org.mozilla.javascript.internal.EcmaError;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.IOException;
-import java.util.*;
-
-/**
- * 提供http访问接口
- * Created by lenovo on 2016/5/16.
- */
-@Controller
-@RequestMapping(value = "feature")
-public class FeatureController {
-    @Autowired
-    private FeatureManager featureManager;
-    @Autowired
-    private UserManager userManager;
-    @Autowired
-    private CompanyManager companyManager;
-
-    @RequestMapping(value = "org-list")
-    @ResponseBody
-    public String getOrgList(@RequestParam(required = true) Integer type, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Company company = user.getCompany();
-        return featureManager.getOrgList(type, company);
-    }
-
-    @RequestMapping(value = "org-list-na")
-    @ResponseBody
-    public Map<String, String> getOrgListNa(@RequestParam Long userId) {//na端所有传过来的userid都是公司id
-        Map<String, String> res = new HashMap<String, String>();
-        res.put("message", "列表获取失败");
-        try {
-//            User user = userManager.getUserById(userId);//获取当前登录用户
-//            Company company = user.getCompany();
-            Company company = companyManager.getCompanyById(userId);
-            String areas = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.AREA.getIndex(), company);
-            String lines = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.LINE.getIndex(), company);
-            res.put("feature", areas);
-            res.put("line", lines);
-        } catch (Exception e) {
-            return res;
-        }
-        res.put("message", "成功获取");
-        return res;
-    }
-
-    @RequestMapping(value = "getFeature")
-    @ResponseBody
-    public Map<String, Object> getFeaturesByUser(@RequestParam(required = true) Integer type, HttpSession session) {
-
-        Map<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        List<FeatureDto> list = featureManager.getFeaturesByUser(type, user);
-        if (list == null) {//获取列表失败
-            result.put("message", "获取列表出现错误");
-            return result;
-        } else {
-            result.put("data", list);
-            result.put("message", "获取列表成功");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "getSubFeatureList")
-    public void getSubFeatureList(@RequestParam(required = true) String jsonParams, @RequestParam(required = false) Long parentId, HttpServletResponse response, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Feature parent = featureManager.getFeatureById(parentId);
-        DataTable<FeatureDto> dtoDataTable = featureManager.getPageFeatureListByTye(jsonParams, parent, user);
-        Gson gson = new Gson();
-        String json = gson.toJson(dtoDataTable);
-        response.setCharacterEncoding("utf-8");
-        try {
-            response.getWriter().write(json);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @RequestMapping(value = "delete")
-    @ResponseBody
-    public Map<String, Object> deleteFeatureById(@RequestParam(required = true) Long id, HttpSession session) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        try {
-            String res = featureManager.invalidFeature(id.toString());
-            if (StringUtils.isBlank(res)) {
-                result.put("message", "删除失败");
-            } else {
-                result.put("message", "删除成功");
-                result.put("success", true);
-            }
-        } catch (Exception e) {
-            result.put("message", "删除失败");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "save")
-    @ResponseBody
-    public Map<String, Object> save(@RequestParam(required = true) String params, HttpSession session) {
-        Gson gson = new Gson();
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        Map markers = gson.fromJson(params, HashMap.class);
-        String featureName = (String) markers.get("featureName");
-        String memo = (String) markers.get("memo") == null ? "" : (String) markers.get("memo");
-        Long parentId = Long.valueOf(StringUtils.isBlank((String) markers.get("parentId")) ? "-1" : (String) markers.get("parentId"));//不知为什么转过来为Double
-        Long id = Long.valueOf(StringUtils.isBlank((String) markers.get("id")) ? "-1" : (String) markers.get("id"));
-
-
-        if (StringUtils.isBlank(featureName) || parentId.equals(-1L)) {
-            result.put("message", "必要参数未传送");
-            return result;
-        }
-        Feature feature = new Feature();
-        feature.setValid(1);
-        Feature parent = featureManager.getFeatureById(parentId);
-        feature.setParent(parent);
-        feature.setFeatureName(featureName);
-        feature.setMemo(memo);
-        feature.setOwner(user);
-        feature.setCompany(user.getCompany());
-        feature.setType(parent.getType());
-        if (!id.equals(-1L)) {
-            feature.setId(id);
-        }
-        try {
-            featureManager.saveOrupdateFeature(feature, user);
-            result.put("message", "保存成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "保存失败");
-        }
-        return result;
-
-    }
-
-
-    @RequestMapping(value = "getFeatureById")
-    @ResponseBody
-    public Map<String, Object> getFeatureById(@RequestParam(required = true) Long id) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        try {
-            FeatureDto feature = featureManager.getFeatureDtoById(id);
-            result.put("data", feature);
-            result.put("message", "获取成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "获取失败");
-        }
-        return result;
-
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
index 08a290e..3f53635 100644
--- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
+++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
@@ -1,6 +1,6 @@
 package com.casic.accessControl.marker.dto;
 
-import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.domain.Feature;
 import com.casic.accessControl.marker.domain.Marker;
 import org.apache.commons.collections.CollectionUtils;
 
diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
index 080b291..7fe7434 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -4,8 +4,6 @@
 import com.casic.accessControl.core.hibernate.HibernateEntityDao;
 import com.casic.accessControl.core.page.Page;
 import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.user.domain.Company;
@@ -49,9 +47,6 @@
 public class MarkerManager extends HibernateEntityDao<Marker> {
 
     @Resource
-    private FeatureManager featureManager;
-
-    @Resource
     private UserManager userInfoManager;
 
 
@@ -154,33 +149,33 @@
 
     //获取marker
 //    @Cacheable(value = "getMarkerByFeature", key = "#feature.getId()")
-    public List<Marker> getMarkerByFeature(Feature feature) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            criteria.add(Restrictions.eq("belongLine", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            criteria.add(Restrictions.eq("belongLine", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
-    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
-            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
+//            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
     public boolean saveMarker(Marker marker) {
         try {
@@ -465,7 +460,7 @@
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setLayStyle(sheet.getCell(indexMap.get("layStyle"), i).getContents());
-                } else if(recordTypeFlag == 4) {
+                } else if (recordTypeFlag == 4) {
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setBelowType(sheet.getCell(indexMap.get("belowType"), i).getContents());
diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
index a19f2f5..7675e1f 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -2,9 +2,6 @@
 
 import com.casic.accessControl.core.ext.export.CsvExportor;
 import com.casic.accessControl.core.ext.export.TableModel;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.manager.MarkerManager;
diff --git a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java b/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
deleted file mode 100644
index e69de29..0000000
--- a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
+++ /dev/null
diff --git a/src/main/java/com/casic/accessControl/rs/FeatureResource.java b/src/main/java/com/casic/accessControl/rs/FeatureResource.java
index 68aeb97..e97f18b 100644
--- a/src/main/java/com/casic/accessControl/rs/FeatureResource.java
+++ b/src/main/java/com/casic/accessControl/rs/FeatureResource.java
@@ -1,65 +1,65 @@
-package com.casic.accessControl.rs;
-
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.UserManager;
-import com.google.gson.Gson;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import javax.annotation.Resource;
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
-* Created by admin on 2015/1/15.
-*/
-@Component
-@Path("feature")
-public class FeatureResource
-{
-    private static Logger logger = LoggerFactory.getLogger(FeatureResource.class);
-
-    @Resource
-    private UserManager userManager;
-
-    @Resource
-    private FeatureManager featureManager;
-
-    @GET
-    @Path("get")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map get(@QueryParam("userName") String userName ){
-        Map map = new HashMap<String, Object>();
-        try {
-            User user = userManager.getUserByName(userName);
-            if (user == null) {
-                map.put("success", "false");
-                map.put("message", "人员不存在！");
-                return map;
-            }
-            Company company = user.getCompany();
-            if (company!=null)
-            {
-                List<Feature> features = featureManager.getFeaturesByCompany(company);
-                List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos(features);
-                map.put("success", "true");
-                map.put("message", featureDtos);
-            }
-        }
-        catch (Exception e)
-        {
-            map.put("success", "false");
-            map.put("message", e.getMessage());
-        }
-        return  map;
-    }
-}
+//package com.casic.accessControl.rs;
+//
+//import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.dto.FeatureDto;
+//import com.casic.accessControl.feature.manager.FeatureManager;
+//import com.casic.accessControl.user.domain.Company;
+//import com.casic.accessControl.user.domain.User;
+//import com.casic.accessControl.user.manager.UserManager;
+//import com.google.gson.Gson;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.stereotype.Component;
+//import org.springframework.web.bind.annotation.RequestParam;
+//
+//import javax.annotation.Resource;
+//import javax.ws.rs.*;
+//import javax.ws.rs.core.MediaType;
+//import java.util.HashMap;
+//import java.util.List;
+//import java.util.Map;
+//
+///**
+//* Created by admin on 2015/1/15.
+//*/
+//@Component
+//@Path("feature")
+//public class FeatureResource
+//{
+//    private static Logger logger = LoggerFactory.getLogger(FeatureResource.class);
+//
+//    @Resource
+//    private UserManager userManager;
+//
+//    @Resource
+//    private FeatureManager featureManager;
+//
+//    @GET
+//    @Path("get")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public Map get(@QueryParam("userName") String userName ){
+//        Map map = new HashMap<String, Object>();
+//        try {
+//            User user = userManager.getUserByName(userName);
+//            if (user == null) {
+//                map.put("success", "false");
+//                map.put("message", "人员不存在！");
+//                return map;
+//            }
+//            Company company = user.getCompany();
+//            if (company!=null)
+//            {
+//                List<Feature> features = featureManager.getFeaturesByCompany(company);
+//                List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos(features);
+//                map.put("success", "true");
+//                map.put("message", featureDtos);
+//            }
+//        }
+//        catch (Exception e)
+//        {
+//            map.put("success", "false");
+//            map.put("message", e.getMessage());
+//        }
+//        return  map;
+//    }
+//}

diff --git a/src/main/java/com/casic/accessControl/feature/domain/Feature.java b/src/main/java/com/casic/accessControl/feature/domain/Feature.java
deleted file mode 100644
index c89a0c2..0000000
--- a/src/main/java/com/casic/accessControl/feature/domain/Feature.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.casic.accessControl.feature.domain;
-
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-
-import javax.persistence.*;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-//点的信息
-@Entity
-@Table(name = "feature")
-public class Feature {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private Long id;
-    @Column(name = "longitude")
-    private Double longitude;
-    @Column(name = "latitude")
-    private Double latitude;
-    @Column(name = "featureName")
-    private String featureName;
-    @Column(name = "type")
-    private int type;
-    @Column(name = "isValid")
-    private Integer isValid;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "parent")
-    private Feature parent;
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "parent")
-    private List<Feature> children;
-    @Column(name = "memo")
-    private String memo;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "owner", referencedColumnName = "id")
-    private User owner;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "company", referencedColumnName = "id")
-    private Company company;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer isValid() {
-        return isValid;
-    }
-
-    public void setValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public Feature getParent() {
-        return parent;
-    }
-
-    public void setParent(Feature parent) {
-        this.parent = parent;
-    }
-
-    public List<Feature> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<Feature> children) {
-        this.children = children;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public User getOwner() {
-        return owner;
-    }
-
-    public void setOwner(User owner) {
-        this.owner = owner;
-    }
-
-    public Company getCompany() {
-        return company;
-    }
-
-    public void setCompany(Company company) {
-        this.company = company;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java b/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
deleted file mode 100644
index 256f261..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import com.casic.accessControl.feature.domain.Feature;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/17.
- */
-public class FeatureDto {
-    private Long id;
-    private Double longitude;
-    private Double latitude;
-    private String featureName;
-    private int type;
-    private Integer isValid;
-    private String memo;
-    private Long parentId;
-
-    private String btnEdit = "<a href='#' class='btn mini blue'><i class='icon-edit'></i>编辑</a>";
-    private String btnDelete = "<a href='#' class='btn mini red'><i class='icon-trash'></i>删除</a>";
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer getIsValid() {
-        return isValid;
-    }
-
-    public void setIsValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public Long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getBtnEdit() {
-        return btnEdit;
-    }
-
-    public void setBtnEdit(String btnEdit) {
-        this.btnEdit = btnEdit;
-    }
-
-    public String getBtnDelete() {
-        return btnDelete;
-    }
-
-    public void setBtnDelete(String btnDelete) {
-        this.btnDelete = btnDelete;
-    }
-
-    public static FeatureDto convert2FeatureDto(Feature feature) {
-        if (feature == null) {
-            return null;
-        }
-        FeatureDto featureDto = new FeatureDto();
-        featureDto.setId(feature.getId());
-        featureDto.setFeatureName(feature.getFeatureName());
-        featureDto.setIsValid(feature.isValid());
-        featureDto.setLatitude(feature.getLatitude());
-        featureDto.setLongitude(feature.getLongitude());
-        featureDto.setMemo(feature.getMemo());
-        featureDto.setType(feature.getType());
-        if (feature.getParent() != null)
-            featureDto.setParentId(feature.getParent().getId());
-        return featureDto;
-    }
-
-    public static List<FeatureDto> convert2FeatureDtos(List<Feature> features) {
-        List<FeatureDto> featureDtos = new ArrayList<FeatureDto>();
-        for (Feature feature : features) {
-            featureDtos.add(convert2FeatureDto(feature));
-        }
-        return featureDtos;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java b/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
deleted file mode 100644
index 785dcba..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/19.
- */
-public class OrgDto {
-    private long id;
-
-    private String name;
-
-    private long parentId;
-
-    private List<OrgDto> children = new ArrayList<OrgDto>();
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(long parentId) {
-        this.parentId = parentId;
-    }
-
-    public List<OrgDto> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<OrgDto> children) {
-        this.children = children;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java b/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
deleted file mode 100644
index a475e21..0000000
--- a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
+++ /dev/null
@@ -1,316 +0,0 @@
-package com.casic.accessControl.feature.manager;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.core.page.Page;
-import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.marker.manager.MarkerManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.DataTableParameter;
-import com.casic.accessControl.util.DataTableUtils;
-import org.apache.commons.collections.CollectionUtils;
-import org.hibernate.Criteria;
-import org.hibernate.Query;
-import org.hibernate.criterion.Restrictions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.jdbc.object.SqlQuery;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-@Service
-public class FeatureManager extends HibernateEntityDao<Feature> {
-
-    private Logger logger = LoggerFactory.getLogger(this.getClass());
-    @Resource
-    private MarkerManager markerManager;
-
-
-    public Feature getFeatureById(Long id) {
-        Feature feature = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("id", id)).add(Restrictions.eq("isValid", 1));
-            feature = (Feature) criteria.list().get(0);
-        } catch (Exception e) {
-            return null;
-        }
-        return feature;
-    }
-
-    public FeatureDto getFeatureDtoById(Long id) {
-        return FeatureDto.convert2FeatureDto(getFeatureById(id));
-    }
-
-    /**
-     * 根据id，软删除某个点或线或片
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param ids 多个id
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public String invalidFeature(String ids) {
-        if (StringUtils.isBlank(ids) || ids.indexOf(")") != -1) {//未传入值，直接返回，防止无效查询,过滤非法请求，防止sql注入
-            return "";
-        }
-        String[] idsArr = ids.split(",");
-        StringBuilder canDeleteIds = new StringBuilder("");
-        StringBuilder cantDeleleIds = new StringBuilder("");
-        //找出能删除的和不能删除的id组合
-        for (String id : idsArr) {
-            Long longId = Long.valueOf(id);
-            if (this.isCanDelete(longId)) {
-                if (canDeleteIds.length() > 0) {
-                    canDeleteIds.append(",");
-                }
-                canDeleteIds.append(id);
-
-            } else {
-                if (cantDeleleIds.length() > 0) {
-                    cantDeleleIds.append(",");
-                }
-                cantDeleleIds.append(id);
-            }
-        }
-
-        String temp1Ids = canDeleteIds.toString();
-        String temp2Ids = cantDeleleIds.toString();
-        if (StringUtils.isNotBlank(temp2Ids)) {//有不能删除的，都不删除
-            return "";
-        }
-        Query query = this.getSession().createQuery("update Feature f set f.isValid = 0 where id in (" + temp1Ids + ")");
-        query.executeUpdate();
-
-        return "success";
-    }
-
-    /**
-     * 判断feature是否可以删除
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param id
-     * @return
-     */
-    private boolean isCanDelete(Long id) {
-        Feature feature = this.getFeatureById(id);
-        if (feature.getParent() == null) {//所有用户共用的根节点不能删除
-            return false;
-        }
-        if (CollectionUtils.isNotEmpty(feature.getChildren())) {
-            for (Feature child : feature.getChildren()) {
-                if (child.isValid() == 1) {
-                    return false;
-                }
-            }
-
-        }
-        List<Marker> markers = markerManager.getMarkerByFeature(feature);
-        if (CollectionUtils.isNotEmpty(markers)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * 将数据库中的feature信息按照参数更新
-     *
-     * @param feature
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public void saveOrupdateFeature(Feature feature, User user) {
-        this.getSession().saveOrUpdate(feature);
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param user 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByUser")
-    public List<FeatureDto> getFeaturesByUser(Integer type, User user) {
-        if (user == null) {
-            return Collections.emptyList();
-        }
-        Company company = user.getCompany();
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("type", type));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-        return FeatureDto.convert2FeatureDtos(features);
-    }
-
-    /**
-     * 分页使用，datatable获取相应type的feature某页数据
-     *
-     * @param params
-     * @param user
-     * @return
-     */
-    public DataTable<FeatureDto> getPageFeatureListByTye(String params, Feature parent, User user) {
-        DataTable<FeatureDto> result = new DataTable<FeatureDto>();
-        DataTableParameter parameter = DataTableUtils.getDataTableParameterByJsonParam(params);
-        int start = parameter.getiDisplayStart();
-        int pageSize = parameter.getiDisplayLength();
-        int pageNo = (start / pageSize) + 1;
-        Criteria criteria = this.createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        Company company = user.getCompany();
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("isValid", 1)).add(Restrictions.eq("parent", parent));
-        Page page = pagedQuery(criteria, pageNo, pageSize);
-        List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos((List<Feature>) page.getResult());
-        result.setAaData(featureDtos);
-        result.setiTotalDisplayRecords((int) page.getTotalCount());
-        result.setiTotalRecords((int) page.getTotalCount());
-        result.setsEcho(parameter.getsEcho());
-        return result;
-
-
-    }
-
-    /**
-     * 获取层次结构列表,增加缓存
-     *
-     * @param type
-     * @param company
-     * @return
-     */
-    @Cacheable(value = "getOrgList")
-    public String getOrgList(Integer type, Company company) {
-        List<OrgDto> orgDtos = new ArrayList<OrgDto>();
-        List<Feature> features = this.getRootFeatures(type);
-        for (Feature feature : features) {
-            orgDtos.add(this.getChildrenByParentId(feature.getId(), company));
-        }
-        String jsonStr = null;
-        try {
-            jsonStr = new JsonMapper().toJson(orgDtos);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return jsonStr;
-    }
-
-    //    @Cacheable(value = "getChildrenByParentId", key = "#id")
-    public OrgDto getChildrenByParentId(Long id, Company company) {
-        if (id == null) {
-            return null;
-        }
-        Feature feature = getFeatureById(id);
-        if (feature == null) {
-            return null;
-        }
-        //创建OrgDto节点
-        OrgDto orgDto = new OrgDto();
-        orgDto.setId(id); //保存ID信息
-        orgDto.setName(feature.getFeatureName());
-        if (feature.getParent() != null) {
-            orgDto.setParentId(feature.getParent().getId());
-        }
-        List<Feature> departments = this.getActiveChildrenOrgs(feature, company);
-        for (Feature fea : departments) {
-            orgDto.getChildren().add(this.getChildrenByParentId(fea.getId(), company));
-        }
-        return orgDto;
-    }
-
-    //    @Cacheable(value = "getActiveChildrenOrgs", key = "#department.getId()")
-    private List<Feature> getActiveChildrenOrgs(Feature department, Company company) {
-        List<Feature> features = new ArrayList<Feature>();
-        for (Feature feature : department.getChildren()) {
-            if (feature.isValid() == 1 && feature.getCompany().getId().equals(company.getId())) {
-                features.add(feature);
-            }
-        }
-        return features;
-    }
-
-
-    public List<Feature> getRootFeatures(Integer type) {
-        List<Feature> features = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("type", type)).add(Restrictions.isNull("parent"));
-            features = criteria.list();
-        } catch (Exception e) {
-            return Collections.emptyList();
-        }
-        return features;
-
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param company 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByCompany", key = "#company.getId()")
-    public List<Feature> getFeaturesByCompany(Company company) {
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-        criteria.add(Restrictions.eq("company", company));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-
-        for (Feature f : features) {
-            f.getChildren().toString();
-            f.getOwner().toString();
-            if (f.getParent() != null)
-                f.getParent().toString();
-        }
-        return features;
-    }
-
-    /**
-     * 根据组织结构的id获取叶子节点
-     ***重要：**已更改为包含本节点****
-     * @param type
-     * @param feature
-     * @return
-     */
-    public List<Feature> getLeafByParentId(Integer type, Feature feature) {
-        if (feature == null || feature.isValid() == 0) return Collections.emptyList();
-        List<Feature> features = new ArrayList<Feature>();
-        if (CollectionUtils.isEmpty(feature.getChildren())) {
-            features.add(feature);
-            return features;
-        }
-        List<Feature> children = feature.getChildren();
-        boolean flag = false;
-        for (Feature child : children) {
-            if (child.isValid() == 1) {
-                flag = true;
-                features.addAll(getLeafByParentId(type, child));
-            }
-        }
-//        if (!flag) {//没有有效的子节点
-            features.add(feature);
-//        }
-        return features;
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java b/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
deleted file mode 100644
index a706a36..0000000
--- a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package com.casic.accessControl.feature.web;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.Role;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.CompanyManager;
-import com.casic.accessControl.user.manager.UserManager;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.StringUtils;
-import com.casic.accessControl.xls.Common;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import sun.org.mozilla.javascript.internal.EcmaError;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.IOException;
-import java.util.*;
-
-/**
- * 提供http访问接口
- * Created by lenovo on 2016/5/16.
- */
-@Controller
-@RequestMapping(value = "feature")
-public class FeatureController {
-    @Autowired
-    private FeatureManager featureManager;
-    @Autowired
-    private UserManager userManager;
-    @Autowired
-    private CompanyManager companyManager;
-
-    @RequestMapping(value = "org-list")
-    @ResponseBody
-    public String getOrgList(@RequestParam(required = true) Integer type, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Company company = user.getCompany();
-        return featureManager.getOrgList(type, company);
-    }
-
-    @RequestMapping(value = "org-list-na")
-    @ResponseBody
-    public Map<String, String> getOrgListNa(@RequestParam Long userId) {//na端所有传过来的userid都是公司id
-        Map<String, String> res = new HashMap<String, String>();
-        res.put("message", "列表获取失败");
-        try {
-//            User user = userManager.getUserById(userId);//获取当前登录用户
-//            Company company = user.getCompany();
-            Company company = companyManager.getCompanyById(userId);
-            String areas = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.AREA.getIndex(), company);
-            String lines = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.LINE.getIndex(), company);
-            res.put("feature", areas);
-            res.put("line", lines);
-        } catch (Exception e) {
-            return res;
-        }
-        res.put("message", "成功获取");
-        return res;
-    }
-
-    @RequestMapping(value = "getFeature")
-    @ResponseBody
-    public Map<String, Object> getFeaturesByUser(@RequestParam(required = true) Integer type, HttpSession session) {
-
-        Map<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        List<FeatureDto> list = featureManager.getFeaturesByUser(type, user);
-        if (list == null) {//获取列表失败
-            result.put("message", "获取列表出现错误");
-            return result;
-        } else {
-            result.put("data", list);
-            result.put("message", "获取列表成功");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "getSubFeatureList")
-    public void getSubFeatureList(@RequestParam(required = true) String jsonParams, @RequestParam(required = false) Long parentId, HttpServletResponse response, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Feature parent = featureManager.getFeatureById(parentId);
-        DataTable<FeatureDto> dtoDataTable = featureManager.getPageFeatureListByTye(jsonParams, parent, user);
-        Gson gson = new Gson();
-        String json = gson.toJson(dtoDataTable);
-        response.setCharacterEncoding("utf-8");
-        try {
-            response.getWriter().write(json);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @RequestMapping(value = "delete")
-    @ResponseBody
-    public Map<String, Object> deleteFeatureById(@RequestParam(required = true) Long id, HttpSession session) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        try {
-            String res = featureManager.invalidFeature(id.toString());
-            if (StringUtils.isBlank(res)) {
-                result.put("message", "删除失败");
-            } else {
-                result.put("message", "删除成功");
-                result.put("success", true);
-            }
-        } catch (Exception e) {
-            result.put("message", "删除失败");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "save")
-    @ResponseBody
-    public Map<String, Object> save(@RequestParam(required = true) String params, HttpSession session) {
-        Gson gson = new Gson();
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        Map markers = gson.fromJson(params, HashMap.class);
-        String featureName = (String) markers.get("featureName");
-        String memo = (String) markers.get("memo") == null ? "" : (String) markers.get("memo");
-        Long parentId = Long.valueOf(StringUtils.isBlank((String) markers.get("parentId")) ? "-1" : (String) markers.get("parentId"));//不知为什么转过来为Double
-        Long id = Long.valueOf(StringUtils.isBlank((String) markers.get("id")) ? "-1" : (String) markers.get("id"));
-
-
-        if (StringUtils.isBlank(featureName) || parentId.equals(-1L)) {
-            result.put("message", "必要参数未传送");
-            return result;
-        }
-        Feature feature = new Feature();
-        feature.setValid(1);
-        Feature parent = featureManager.getFeatureById(parentId);
-        feature.setParent(parent);
-        feature.setFeatureName(featureName);
-        feature.setMemo(memo);
-        feature.setOwner(user);
-        feature.setCompany(user.getCompany());
-        feature.setType(parent.getType());
-        if (!id.equals(-1L)) {
-            feature.setId(id);
-        }
-        try {
-            featureManager.saveOrupdateFeature(feature, user);
-            result.put("message", "保存成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "保存失败");
-        }
-        return result;
-
-    }
-
-
-    @RequestMapping(value = "getFeatureById")
-    @ResponseBody
-    public Map<String, Object> getFeatureById(@RequestParam(required = true) Long id) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        try {
-            FeatureDto feature = featureManager.getFeatureDtoById(id);
-            result.put("data", feature);
-            result.put("message", "获取成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "获取失败");
-        }
-        return result;
-
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
index 08a290e..3f53635 100644
--- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
+++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
@@ -1,6 +1,6 @@
 package com.casic.accessControl.marker.dto;
 
-import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.domain.Feature;
 import com.casic.accessControl.marker.domain.Marker;
 import org.apache.commons.collections.CollectionUtils;
 
diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
index 080b291..7fe7434 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -4,8 +4,6 @@
 import com.casic.accessControl.core.hibernate.HibernateEntityDao;
 import com.casic.accessControl.core.page.Page;
 import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.user.domain.Company;
@@ -49,9 +47,6 @@
 public class MarkerManager extends HibernateEntityDao<Marker> {
 
     @Resource
-    private FeatureManager featureManager;
-
-    @Resource
     private UserManager userInfoManager;
 
 
@@ -154,33 +149,33 @@
 
     //获取marker
 //    @Cacheable(value = "getMarkerByFeature", key = "#feature.getId()")
-    public List<Marker> getMarkerByFeature(Feature feature) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            criteria.add(Restrictions.eq("belongLine", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            criteria.add(Restrictions.eq("belongLine", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
-    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
-            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
+//            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
     public boolean saveMarker(Marker marker) {
         try {
@@ -465,7 +460,7 @@
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setLayStyle(sheet.getCell(indexMap.get("layStyle"), i).getContents());
-                } else if(recordTypeFlag == 4) {
+                } else if (recordTypeFlag == 4) {
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setBelowType(sheet.getCell(indexMap.get("belowType"), i).getContents());
diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
index a19f2f5..7675e1f 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -2,9 +2,6 @@
 
 import com.casic.accessControl.core.ext.export.CsvExportor;
 import com.casic.accessControl.core.ext.export.TableModel;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.manager.MarkerManager;
diff --git a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java b/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
deleted file mode 100644
index e69de29..0000000
--- a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
+++ /dev/null
diff --git a/src/main/java/com/casic/accessControl/rs/FeatureResource.java b/src/main/java/com/casic/accessControl/rs/FeatureResource.java
index 68aeb97..e97f18b 100644
--- a/src/main/java/com/casic/accessControl/rs/FeatureResource.java
+++ b/src/main/java/com/casic/accessControl/rs/FeatureResource.java
@@ -1,65 +1,65 @@
-package com.casic.accessControl.rs;
-
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.UserManager;
-import com.google.gson.Gson;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import javax.annotation.Resource;
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
-* Created by admin on 2015/1/15.
-*/
-@Component
-@Path("feature")
-public class FeatureResource
-{
-    private static Logger logger = LoggerFactory.getLogger(FeatureResource.class);
-
-    @Resource
-    private UserManager userManager;
-
-    @Resource
-    private FeatureManager featureManager;
-
-    @GET
-    @Path("get")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map get(@QueryParam("userName") String userName ){
-        Map map = new HashMap<String, Object>();
-        try {
-            User user = userManager.getUserByName(userName);
-            if (user == null) {
-                map.put("success", "false");
-                map.put("message", "人员不存在！");
-                return map;
-            }
-            Company company = user.getCompany();
-            if (company!=null)
-            {
-                List<Feature> features = featureManager.getFeaturesByCompany(company);
-                List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos(features);
-                map.put("success", "true");
-                map.put("message", featureDtos);
-            }
-        }
-        catch (Exception e)
-        {
-            map.put("success", "false");
-            map.put("message", e.getMessage());
-        }
-        return  map;
-    }
-}
+//package com.casic.accessControl.rs;
+//
+//import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.dto.FeatureDto;
+//import com.casic.accessControl.feature.manager.FeatureManager;
+//import com.casic.accessControl.user.domain.Company;
+//import com.casic.accessControl.user.domain.User;
+//import com.casic.accessControl.user.manager.UserManager;
+//import com.google.gson.Gson;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.stereotype.Component;
+//import org.springframework.web.bind.annotation.RequestParam;
+//
+//import javax.annotation.Resource;
+//import javax.ws.rs.*;
+//import javax.ws.rs.core.MediaType;
+//import java.util.HashMap;
+//import java.util.List;
+//import java.util.Map;
+//
+///**
+//* Created by admin on 2015/1/15.
+//*/
+//@Component
+//@Path("feature")
+//public class FeatureResource
+//{
+//    private static Logger logger = LoggerFactory.getLogger(FeatureResource.class);
+//
+//    @Resource
+//    private UserManager userManager;
+//
+//    @Resource
+//    private FeatureManager featureManager;
+//
+//    @GET
+//    @Path("get")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public Map get(@QueryParam("userName") String userName ){
+//        Map map = new HashMap<String, Object>();
+//        try {
+//            User user = userManager.getUserByName(userName);
+//            if (user == null) {
+//                map.put("success", "false");
+//                map.put("message", "人员不存在！");
+//                return map;
+//            }
+//            Company company = user.getCompany();
+//            if (company!=null)
+//            {
+//                List<Feature> features = featureManager.getFeaturesByCompany(company);
+//                List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos(features);
+//                map.put("success", "true");
+//                map.put("message", featureDtos);
+//            }
+//        }
+//        catch (Exception e)
+//        {
+//            map.put("success", "false");
+//            map.put("message", e.getMessage());
+//        }
+//        return  map;
+//    }
+//}
diff --git a/src/main/java/com/casic/accessControl/rs/MapInfo.java b/src/main/java/com/casic/accessControl/rs/MapInfo.java
deleted file mode 100644
index a77fce9..0000000
--- a/src/main/java/com/casic/accessControl/rs/MapInfo.java
+++ /dev/null
@@ -1,131 +0,0 @@
-//package com.casic.accessControl.rs;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-///**
-// * Created by admin on 2015/8/26.
-// */
-//public class MapInfo {
-//
-//    private String mapUrl;
-//
-//    private String updateTime;
-//
-//    private String uploader;
-//
-//    private String name;
-//
-//    private String uuid;
-//
-//    private String site;
-//    /*
-//    0:草稿
-//    1：待审核
-//    2：通过
-//    3: 驳回
-//     */
-//    private String status;
-//
-//    //
-//    private int id;
-//
-//
-//    public String getMapUrl()
-//    {
-//        return mapUrl;
-//    }
-//
-//    public void setMapUrl(String mapUrl)
-//    {
-//        this.mapUrl = mapUrl;
-//    }
-//
-//    public String getUpdateTime()
-//    {
-//        return updateTime;
-//    }
-//
-//    public void setUpdateTime(String updateTime)
-//    {
-//        this.updateTime = updateTime;
-//    }
-//
-//    public String getUploader()
-//    {
-//        return uploader;
-//    }
-//
-//    public void setUploader(String uploader)
-//    {
-//        this.uploader = uploader;
-//    }
-//
-//    public String getName()
-//    {
-//        return name;
-//    }
-//
-//    public void setName(String name)
-//    {
-//        this.name = name;
-//    }
-//
-//    public String getUuid()
-//    {
-//        return uuid;
-//    }
-//
-//    public void setUuid(String uuid)
-//    {
-//        this.uuid = uuid;
-//    }
-//
-//    public String getSite()
-//    {
-//        return site;
-//    }
-//
-//    public void setSite(String site)
-//    {
-//        this.site = site;
-//    }
-//
-//    public String getStatus()
-//    {
-//        return status;
-//    }
-//
-//    public void setStatus(String status)
-//    {
-//        this.status = status;
-//    }
-//
-//    public int getId()
-//    {
-//        return id;
-//    }
-//
-//    public void setId(int id)
-//    {
-//        this.id = id;
-//    }
-//
-//    public static List<MapInfo> getMockerMaps()
-//    {
-//        List<MapInfo> maps = new ArrayList<MapInfo>();
-//        for (int i = 0; i < 20; i++)
-//        {
-//            MapInfo map = new MapInfo();
-//            map.setId(i);
-//            map.setUploader("张帆");
-//            map.setMapUrl("http://192.168.0.111:9080/accessControl/logo.jpg");
-//            map.setSite("永旺路"+i);
-//            map.setUpdateTime("2015-08-02");
-//            map.setStatus("待审核");
-//            maps.add(map);
-//        }
-//        return maps;
-//
-//    }
-//}

diff --git a/src/main/java/com/casic/accessControl/feature/domain/Feature.java b/src/main/java/com/casic/accessControl/feature/domain/Feature.java
deleted file mode 100644
index c89a0c2..0000000
--- a/src/main/java/com/casic/accessControl/feature/domain/Feature.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.casic.accessControl.feature.domain;
-
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-
-import javax.persistence.*;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-//点的信息
-@Entity
-@Table(name = "feature")
-public class Feature {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private Long id;
-    @Column(name = "longitude")
-    private Double longitude;
-    @Column(name = "latitude")
-    private Double latitude;
-    @Column(name = "featureName")
-    private String featureName;
-    @Column(name = "type")
-    private int type;
-    @Column(name = "isValid")
-    private Integer isValid;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "parent")
-    private Feature parent;
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "parent")
-    private List<Feature> children;
-    @Column(name = "memo")
-    private String memo;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "owner", referencedColumnName = "id")
-    private User owner;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "company", referencedColumnName = "id")
-    private Company company;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer isValid() {
-        return isValid;
-    }
-
-    public void setValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public Feature getParent() {
-        return parent;
-    }
-
-    public void setParent(Feature parent) {
-        this.parent = parent;
-    }
-
-    public List<Feature> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<Feature> children) {
-        this.children = children;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public User getOwner() {
-        return owner;
-    }
-
-    public void setOwner(User owner) {
-        this.owner = owner;
-    }
-
-    public Company getCompany() {
-        return company;
-    }
-
-    public void setCompany(Company company) {
-        this.company = company;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java b/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
deleted file mode 100644
index 256f261..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import com.casic.accessControl.feature.domain.Feature;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/17.
- */
-public class FeatureDto {
-    private Long id;
-    private Double longitude;
-    private Double latitude;
-    private String featureName;
-    private int type;
-    private Integer isValid;
-    private String memo;
-    private Long parentId;
-
-    private String btnEdit = "<a href='#' class='btn mini blue'><i class='icon-edit'></i>编辑</a>";
-    private String btnDelete = "<a href='#' class='btn mini red'><i class='icon-trash'></i>删除</a>";
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer getIsValid() {
-        return isValid;
-    }
-
-    public void setIsValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public Long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getBtnEdit() {
-        return btnEdit;
-    }
-
-    public void setBtnEdit(String btnEdit) {
-        this.btnEdit = btnEdit;
-    }
-
-    public String getBtnDelete() {
-        return btnDelete;
-    }
-
-    public void setBtnDelete(String btnDelete) {
-        this.btnDelete = btnDelete;
-    }
-
-    public static FeatureDto convert2FeatureDto(Feature feature) {
-        if (feature == null) {
-            return null;
-        }
-        FeatureDto featureDto = new FeatureDto();
-        featureDto.setId(feature.getId());
-        featureDto.setFeatureName(feature.getFeatureName());
-        featureDto.setIsValid(feature.isValid());
-        featureDto.setLatitude(feature.getLatitude());
-        featureDto.setLongitude(feature.getLongitude());
-        featureDto.setMemo(feature.getMemo());
-        featureDto.setType(feature.getType());
-        if (feature.getParent() != null)
-            featureDto.setParentId(feature.getParent().getId());
-        return featureDto;
-    }
-
-    public static List<FeatureDto> convert2FeatureDtos(List<Feature> features) {
-        List<FeatureDto> featureDtos = new ArrayList<FeatureDto>();
-        for (Feature feature : features) {
-            featureDtos.add(convert2FeatureDto(feature));
-        }
-        return featureDtos;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java b/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
deleted file mode 100644
index 785dcba..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/19.
- */
-public class OrgDto {
-    private long id;
-
-    private String name;
-
-    private long parentId;
-
-    private List<OrgDto> children = new ArrayList<OrgDto>();
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(long parentId) {
-        this.parentId = parentId;
-    }
-
-    public List<OrgDto> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<OrgDto> children) {
-        this.children = children;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java b/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
deleted file mode 100644
index a475e21..0000000
--- a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
+++ /dev/null
@@ -1,316 +0,0 @@
-package com.casic.accessControl.feature.manager;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.core.page.Page;
-import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.marker.manager.MarkerManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.DataTableParameter;
-import com.casic.accessControl.util.DataTableUtils;
-import org.apache.commons.collections.CollectionUtils;
-import org.hibernate.Criteria;
-import org.hibernate.Query;
-import org.hibernate.criterion.Restrictions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.jdbc.object.SqlQuery;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-@Service
-public class FeatureManager extends HibernateEntityDao<Feature> {
-
-    private Logger logger = LoggerFactory.getLogger(this.getClass());
-    @Resource
-    private MarkerManager markerManager;
-
-
-    public Feature getFeatureById(Long id) {
-        Feature feature = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("id", id)).add(Restrictions.eq("isValid", 1));
-            feature = (Feature) criteria.list().get(0);
-        } catch (Exception e) {
-            return null;
-        }
-        return feature;
-    }
-
-    public FeatureDto getFeatureDtoById(Long id) {
-        return FeatureDto.convert2FeatureDto(getFeatureById(id));
-    }
-
-    /**
-     * 根据id，软删除某个点或线或片
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param ids 多个id
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public String invalidFeature(String ids) {
-        if (StringUtils.isBlank(ids) || ids.indexOf(")") != -1) {//未传入值，直接返回，防止无效查询,过滤非法请求，防止sql注入
-            return "";
-        }
-        String[] idsArr = ids.split(",");
-        StringBuilder canDeleteIds = new StringBuilder("");
-        StringBuilder cantDeleleIds = new StringBuilder("");
-        //找出能删除的和不能删除的id组合
-        for (String id : idsArr) {
-            Long longId = Long.valueOf(id);
-            if (this.isCanDelete(longId)) {
-                if (canDeleteIds.length() > 0) {
-                    canDeleteIds.append(",");
-                }
-                canDeleteIds.append(id);
-
-            } else {
-                if (cantDeleleIds.length() > 0) {
-                    cantDeleleIds.append(",");
-                }
-                cantDeleleIds.append(id);
-            }
-        }
-
-        String temp1Ids = canDeleteIds.toString();
-        String temp2Ids = cantDeleleIds.toString();
-        if (StringUtils.isNotBlank(temp2Ids)) {//有不能删除的，都不删除
-            return "";
-        }
-        Query query = this.getSession().createQuery("update Feature f set f.isValid = 0 where id in (" + temp1Ids + ")");
-        query.executeUpdate();
-
-        return "success";
-    }
-
-    /**
-     * 判断feature是否可以删除
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param id
-     * @return
-     */
-    private boolean isCanDelete(Long id) {
-        Feature feature = this.getFeatureById(id);
-        if (feature.getParent() == null) {//所有用户共用的根节点不能删除
-            return false;
-        }
-        if (CollectionUtils.isNotEmpty(feature.getChildren())) {
-            for (Feature child : feature.getChildren()) {
-                if (child.isValid() == 1) {
-                    return false;
-                }
-            }
-
-        }
-        List<Marker> markers = markerManager.getMarkerByFeature(feature);
-        if (CollectionUtils.isNotEmpty(markers)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * 将数据库中的feature信息按照参数更新
-     *
-     * @param feature
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public void saveOrupdateFeature(Feature feature, User user) {
-        this.getSession().saveOrUpdate(feature);
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param user 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByUser")
-    public List<FeatureDto> getFeaturesByUser(Integer type, User user) {
-        if (user == null) {
-            return Collections.emptyList();
-        }
-        Company company = user.getCompany();
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("type", type));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-        return FeatureDto.convert2FeatureDtos(features);
-    }
-
-    /**
-     * 分页使用，datatable获取相应type的feature某页数据
-     *
-     * @param params
-     * @param user
-     * @return
-     */
-    public DataTable<FeatureDto> getPageFeatureListByTye(String params, Feature parent, User user) {
-        DataTable<FeatureDto> result = new DataTable<FeatureDto>();
-        DataTableParameter parameter = DataTableUtils.getDataTableParameterByJsonParam(params);
-        int start = parameter.getiDisplayStart();
-        int pageSize = parameter.getiDisplayLength();
-        int pageNo = (start / pageSize) + 1;
-        Criteria criteria = this.createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        Company company = user.getCompany();
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("isValid", 1)).add(Restrictions.eq("parent", parent));
-        Page page = pagedQuery(criteria, pageNo, pageSize);
-        List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos((List<Feature>) page.getResult());
-        result.setAaData(featureDtos);
-        result.setiTotalDisplayRecords((int) page.getTotalCount());
-        result.setiTotalRecords((int) page.getTotalCount());
-        result.setsEcho(parameter.getsEcho());
-        return result;
-
-
-    }
-
-    /**
-     * 获取层次结构列表,增加缓存
-     *
-     * @param type
-     * @param company
-     * @return
-     */
-    @Cacheable(value = "getOrgList")
-    public String getOrgList(Integer type, Company company) {
-        List<OrgDto> orgDtos = new ArrayList<OrgDto>();
-        List<Feature> features = this.getRootFeatures(type);
-        for (Feature feature : features) {
-            orgDtos.add(this.getChildrenByParentId(feature.getId(), company));
-        }
-        String jsonStr = null;
-        try {
-            jsonStr = new JsonMapper().toJson(orgDtos);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return jsonStr;
-    }
-
-    //    @Cacheable(value = "getChildrenByParentId", key = "#id")
-    public OrgDto getChildrenByParentId(Long id, Company company) {
-        if (id == null) {
-            return null;
-        }
-        Feature feature = getFeatureById(id);
-        if (feature == null) {
-            return null;
-        }
-        //创建OrgDto节点
-        OrgDto orgDto = new OrgDto();
-        orgDto.setId(id); //保存ID信息
-        orgDto.setName(feature.getFeatureName());
-        if (feature.getParent() != null) {
-            orgDto.setParentId(feature.getParent().getId());
-        }
-        List<Feature> departments = this.getActiveChildrenOrgs(feature, company);
-        for (Feature fea : departments) {
-            orgDto.getChildren().add(this.getChildrenByParentId(fea.getId(), company));
-        }
-        return orgDto;
-    }
-
-    //    @Cacheable(value = "getActiveChildrenOrgs", key = "#department.getId()")
-    private List<Feature> getActiveChildrenOrgs(Feature department, Company company) {
-        List<Feature> features = new ArrayList<Feature>();
-        for (Feature feature : department.getChildren()) {
-            if (feature.isValid() == 1 && feature.getCompany().getId().equals(company.getId())) {
-                features.add(feature);
-            }
-        }
-        return features;
-    }
-
-
-    public List<Feature> getRootFeatures(Integer type) {
-        List<Feature> features = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("type", type)).add(Restrictions.isNull("parent"));
-            features = criteria.list();
-        } catch (Exception e) {
-            return Collections.emptyList();
-        }
-        return features;
-
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param company 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByCompany", key = "#company.getId()")
-    public List<Feature> getFeaturesByCompany(Company company) {
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-        criteria.add(Restrictions.eq("company", company));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-
-        for (Feature f : features) {
-            f.getChildren().toString();
-            f.getOwner().toString();
-            if (f.getParent() != null)
-                f.getParent().toString();
-        }
-        return features;
-    }
-
-    /**
-     * 根据组织结构的id获取叶子节点
-     ***重要：**已更改为包含本节点****
-     * @param type
-     * @param feature
-     * @return
-     */
-    public List<Feature> getLeafByParentId(Integer type, Feature feature) {
-        if (feature == null || feature.isValid() == 0) return Collections.emptyList();
-        List<Feature> features = new ArrayList<Feature>();
-        if (CollectionUtils.isEmpty(feature.getChildren())) {
-            features.add(feature);
-            return features;
-        }
-        List<Feature> children = feature.getChildren();
-        boolean flag = false;
-        for (Feature child : children) {
-            if (child.isValid() == 1) {
-                flag = true;
-                features.addAll(getLeafByParentId(type, child));
-            }
-        }
-//        if (!flag) {//没有有效的子节点
-            features.add(feature);
-//        }
-        return features;
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java b/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
deleted file mode 100644
index a706a36..0000000
--- a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package com.casic.accessControl.feature.web;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.Role;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.CompanyManager;
-import com.casic.accessControl.user.manager.UserManager;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.StringUtils;
-import com.casic.accessControl.xls.Common;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import sun.org.mozilla.javascript.internal.EcmaError;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.IOException;
-import java.util.*;
-
-/**
- * 提供http访问接口
- * Created by lenovo on 2016/5/16.
- */
-@Controller
-@RequestMapping(value = "feature")
-public class FeatureController {
-    @Autowired
-    private FeatureManager featureManager;
-    @Autowired
-    private UserManager userManager;
-    @Autowired
-    private CompanyManager companyManager;
-
-    @RequestMapping(value = "org-list")
-    @ResponseBody
-    public String getOrgList(@RequestParam(required = true) Integer type, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Company company = user.getCompany();
-        return featureManager.getOrgList(type, company);
-    }
-
-    @RequestMapping(value = "org-list-na")
-    @ResponseBody
-    public Map<String, String> getOrgListNa(@RequestParam Long userId) {//na端所有传过来的userid都是公司id
-        Map<String, String> res = new HashMap<String, String>();
-        res.put("message", "列表获取失败");
-        try {
-//            User user = userManager.getUserById(userId);//获取当前登录用户
-//            Company company = user.getCompany();
-            Company company = companyManager.getCompanyById(userId);
-            String areas = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.AREA.getIndex(), company);
-            String lines = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.LINE.getIndex(), company);
-            res.put("feature", areas);
-            res.put("line", lines);
-        } catch (Exception e) {
-            return res;
-        }
-        res.put("message", "成功获取");
-        return res;
-    }
-
-    @RequestMapping(value = "getFeature")
-    @ResponseBody
-    public Map<String, Object> getFeaturesByUser(@RequestParam(required = true) Integer type, HttpSession session) {
-
-        Map<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        List<FeatureDto> list = featureManager.getFeaturesByUser(type, user);
-        if (list == null) {//获取列表失败
-            result.put("message", "获取列表出现错误");
-            return result;
-        } else {
-            result.put("data", list);
-            result.put("message", "获取列表成功");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "getSubFeatureList")
-    public void getSubFeatureList(@RequestParam(required = true) String jsonParams, @RequestParam(required = false) Long parentId, HttpServletResponse response, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Feature parent = featureManager.getFeatureById(parentId);
-        DataTable<FeatureDto> dtoDataTable = featureManager.getPageFeatureListByTye(jsonParams, parent, user);
-        Gson gson = new Gson();
-        String json = gson.toJson(dtoDataTable);
-        response.setCharacterEncoding("utf-8");
-        try {
-            response.getWriter().write(json);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @RequestMapping(value = "delete")
-    @ResponseBody
-    public Map<String, Object> deleteFeatureById(@RequestParam(required = true) Long id, HttpSession session) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        try {
-            String res = featureManager.invalidFeature(id.toString());
-            if (StringUtils.isBlank(res)) {
-                result.put("message", "删除失败");
-            } else {
-                result.put("message", "删除成功");
-                result.put("success", true);
-            }
-        } catch (Exception e) {
-            result.put("message", "删除失败");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "save")
-    @ResponseBody
-    public Map<String, Object> save(@RequestParam(required = true) String params, HttpSession session) {
-        Gson gson = new Gson();
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        Map markers = gson.fromJson(params, HashMap.class);
-        String featureName = (String) markers.get("featureName");
-        String memo = (String) markers.get("memo") == null ? "" : (String) markers.get("memo");
-        Long parentId = Long.valueOf(StringUtils.isBlank((String) markers.get("parentId")) ? "-1" : (String) markers.get("parentId"));//不知为什么转过来为Double
-        Long id = Long.valueOf(StringUtils.isBlank((String) markers.get("id")) ? "-1" : (String) markers.get("id"));
-
-
-        if (StringUtils.isBlank(featureName) || parentId.equals(-1L)) {
-            result.put("message", "必要参数未传送");
-            return result;
-        }
-        Feature feature = new Feature();
-        feature.setValid(1);
-        Feature parent = featureManager.getFeatureById(parentId);
-        feature.setParent(parent);
-        feature.setFeatureName(featureName);
-        feature.setMemo(memo);
-        feature.setOwner(user);
-        feature.setCompany(user.getCompany());
-        feature.setType(parent.getType());
-        if (!id.equals(-1L)) {
-            feature.setId(id);
-        }
-        try {
-            featureManager.saveOrupdateFeature(feature, user);
-            result.put("message", "保存成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "保存失败");
-        }
-        return result;
-
-    }
-
-
-    @RequestMapping(value = "getFeatureById")
-    @ResponseBody
-    public Map<String, Object> getFeatureById(@RequestParam(required = true) Long id) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        try {
-            FeatureDto feature = featureManager.getFeatureDtoById(id);
-            result.put("data", feature);
-            result.put("message", "获取成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "获取失败");
-        }
-        return result;
-
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
index 08a290e..3f53635 100644
--- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
+++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
@@ -1,6 +1,6 @@
 package com.casic.accessControl.marker.dto;
 
-import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.domain.Feature;
 import com.casic.accessControl.marker.domain.Marker;
 import org.apache.commons.collections.CollectionUtils;
 
diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
index 080b291..7fe7434 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -4,8 +4,6 @@
 import com.casic.accessControl.core.hibernate.HibernateEntityDao;
 import com.casic.accessControl.core.page.Page;
 import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.user.domain.Company;
@@ -49,9 +47,6 @@
 public class MarkerManager extends HibernateEntityDao<Marker> {
 
     @Resource
-    private FeatureManager featureManager;
-
-    @Resource
     private UserManager userInfoManager;
 
 
@@ -154,33 +149,33 @@
 
     //获取marker
 //    @Cacheable(value = "getMarkerByFeature", key = "#feature.getId()")
-    public List<Marker> getMarkerByFeature(Feature feature) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            criteria.add(Restrictions.eq("belongLine", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            criteria.add(Restrictions.eq("belongLine", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
-    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
-            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
+//            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
     public boolean saveMarker(Marker marker) {
         try {
@@ -465,7 +460,7 @@
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setLayStyle(sheet.getCell(indexMap.get("layStyle"), i).getContents());
-                } else if(recordTypeFlag == 4) {
+                } else if (recordTypeFlag == 4) {
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setBelowType(sheet.getCell(indexMap.get("belowType"), i).getContents());
diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
index a19f2f5..7675e1f 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -2,9 +2,6 @@
 
 import com.casic.accessControl.core.ext.export.CsvExportor;
 import com.casic.accessControl.core.ext.export.TableModel;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.manager.MarkerManager;
diff --git a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java b/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
deleted file mode 100644
index e69de29..0000000
--- a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
+++ /dev/null
diff --git a/src/main/java/com/casic/accessControl/rs/FeatureResource.java b/src/main/java/com/casic/accessControl/rs/FeatureResource.java
index 68aeb97..e97f18b 100644
--- a/src/main/java/com/casic/accessControl/rs/FeatureResource.java
+++ b/src/main/java/com/casic/accessControl/rs/FeatureResource.java
@@ -1,65 +1,65 @@
-package com.casic.accessControl.rs;
-
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.UserManager;
-import com.google.gson.Gson;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import javax.annotation.Resource;
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
-* Created by admin on 2015/1/15.
-*/
-@Component
-@Path("feature")
-public class FeatureResource
-{
-    private static Logger logger = LoggerFactory.getLogger(FeatureResource.class);
-
-    @Resource
-    private UserManager userManager;
-
-    @Resource
-    private FeatureManager featureManager;
-
-    @GET
-    @Path("get")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map get(@QueryParam("userName") String userName ){
-        Map map = new HashMap<String, Object>();
-        try {
-            User user = userManager.getUserByName(userName);
-            if (user == null) {
-                map.put("success", "false");
-                map.put("message", "人员不存在！");
-                return map;
-            }
-            Company company = user.getCompany();
-            if (company!=null)
-            {
-                List<Feature> features = featureManager.getFeaturesByCompany(company);
-                List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos(features);
-                map.put("success", "true");
-                map.put("message", featureDtos);
-            }
-        }
-        catch (Exception e)
-        {
-            map.put("success", "false");
-            map.put("message", e.getMessage());
-        }
-        return  map;
-    }
-}
+//package com.casic.accessControl.rs;
+//
+//import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.dto.FeatureDto;
+//import com.casic.accessControl.feature.manager.FeatureManager;
+//import com.casic.accessControl.user.domain.Company;
+//import com.casic.accessControl.user.domain.User;
+//import com.casic.accessControl.user.manager.UserManager;
+//import com.google.gson.Gson;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.stereotype.Component;
+//import org.springframework.web.bind.annotation.RequestParam;
+//
+//import javax.annotation.Resource;
+//import javax.ws.rs.*;
+//import javax.ws.rs.core.MediaType;
+//import java.util.HashMap;
+//import java.util.List;
+//import java.util.Map;
+//
+///**
+//* Created by admin on 2015/1/15.
+//*/
+//@Component
+//@Path("feature")
+//public class FeatureResource
+//{
+//    private static Logger logger = LoggerFactory.getLogger(FeatureResource.class);
+//
+//    @Resource
+//    private UserManager userManager;
+//
+//    @Resource
+//    private FeatureManager featureManager;
+//
+//    @GET
+//    @Path("get")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public Map get(@QueryParam("userName") String userName ){
+//        Map map = new HashMap<String, Object>();
+//        try {
+//            User user = userManager.getUserByName(userName);
+//            if (user == null) {
+//                map.put("success", "false");
+//                map.put("message", "人员不存在！");
+//                return map;
+//            }
+//            Company company = user.getCompany();
+//            if (company!=null)
+//            {
+//                List<Feature> features = featureManager.getFeaturesByCompany(company);
+//                List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos(features);
+//                map.put("success", "true");
+//                map.put("message", featureDtos);
+//            }
+//        }
+//        catch (Exception e)
+//        {
+//            map.put("success", "false");
+//            map.put("message", e.getMessage());
+//        }
+//        return  map;
+//    }
+//}
diff --git a/src/main/java/com/casic/accessControl/rs/MapInfo.java b/src/main/java/com/casic/accessControl/rs/MapInfo.java
deleted file mode 100644
index a77fce9..0000000
--- a/src/main/java/com/casic/accessControl/rs/MapInfo.java
+++ /dev/null
@@ -1,131 +0,0 @@
-//package com.casic.accessControl.rs;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-///**
-// * Created by admin on 2015/8/26.
-// */
-//public class MapInfo {
-//
-//    private String mapUrl;
-//
-//    private String updateTime;
-//
-//    private String uploader;
-//
-//    private String name;
-//
-//    private String uuid;
-//
-//    private String site;
-//    /*
-//    0:草稿
-//    1：待审核
-//    2：通过
-//    3: 驳回
-//     */
-//    private String status;
-//
-//    //
-//    private int id;
-//
-//
-//    public String getMapUrl()
-//    {
-//        return mapUrl;
-//    }
-//
-//    public void setMapUrl(String mapUrl)
-//    {
-//        this.mapUrl = mapUrl;
-//    }
-//
-//    public String getUpdateTime()
-//    {
-//        return updateTime;
-//    }
-//
-//    public void setUpdateTime(String updateTime)
-//    {
-//        this.updateTime = updateTime;
-//    }
-//
-//    public String getUploader()
-//    {
-//        return uploader;
-//    }
-//
-//    public void setUploader(String uploader)
-//    {
-//        this.uploader = uploader;
-//    }
-//
-//    public String getName()
-//    {
-//        return name;
-//    }
-//
-//    public void setName(String name)
-//    {
-//        this.name = name;
-//    }
-//
-//    public String getUuid()
-//    {
-//        return uuid;
-//    }
-//
-//    public void setUuid(String uuid)
-//    {
-//        this.uuid = uuid;
-//    }
-//
-//    public String getSite()
-//    {
-//        return site;
-//    }
-//
-//    public void setSite(String site)
-//    {
-//        this.site = site;
-//    }
-//
-//    public String getStatus()
-//    {
-//        return status;
-//    }
-//
-//    public void setStatus(String status)
-//    {
-//        this.status = status;
-//    }
-//
-//    public int getId()
-//    {
-//        return id;
-//    }
-//
-//    public void setId(int id)
-//    {
-//        this.id = id;
-//    }
-//
-//    public static List<MapInfo> getMockerMaps()
-//    {
-//        List<MapInfo> maps = new ArrayList<MapInfo>();
-//        for (int i = 0; i < 20; i++)
-//        {
-//            MapInfo map = new MapInfo();
-//            map.setId(i);
-//            map.setUploader("张帆");
-//            map.setMapUrl("http://192.168.0.111:9080/accessControl/logo.jpg");
-//            map.setSite("永旺路"+i);
-//            map.setUpdateTime("2015-08-02");
-//            map.setStatus("待审核");
-//            maps.add(map);
-//        }
-//        return maps;
-//
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/rs/MarkResource.java b/src/main/java/com/casic/accessControl/rs/MarkResource.java
index 8ae4d85..cef1580 100644
--- a/src/main/java/com/casic/accessControl/rs/MarkResource.java
+++ b/src/main/java/com/casic/accessControl/rs/MarkResource.java
@@ -1,7 +1,7 @@
 package com.casic.accessControl.rs;
 
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
+//import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.manager.MarkerManager;
 import com.casic.accessControl.user.domain.Company;
@@ -35,8 +35,8 @@
     @Resource
     private MarkerManager markerManager;
 
-    @Resource
-    private FeatureManager featureManager;
+//    @Resource
+//    private FeatureManager featureManager;
 
     @GET
     @Path("post")

diff --git a/src/main/java/com/casic/accessControl/feature/domain/Feature.java b/src/main/java/com/casic/accessControl/feature/domain/Feature.java
deleted file mode 100644
index c89a0c2..0000000
--- a/src/main/java/com/casic/accessControl/feature/domain/Feature.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.casic.accessControl.feature.domain;
-
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-
-import javax.persistence.*;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-//点的信息
-@Entity
-@Table(name = "feature")
-public class Feature {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private Long id;
-    @Column(name = "longitude")
-    private Double longitude;
-    @Column(name = "latitude")
-    private Double latitude;
-    @Column(name = "featureName")
-    private String featureName;
-    @Column(name = "type")
-    private int type;
-    @Column(name = "isValid")
-    private Integer isValid;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "parent")
-    private Feature parent;
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "parent")
-    private List<Feature> children;
-    @Column(name = "memo")
-    private String memo;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "owner", referencedColumnName = "id")
-    private User owner;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "company", referencedColumnName = "id")
-    private Company company;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer isValid() {
-        return isValid;
-    }
-
-    public void setValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public Feature getParent() {
-        return parent;
-    }
-
-    public void setParent(Feature parent) {
-        this.parent = parent;
-    }
-
-    public List<Feature> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<Feature> children) {
-        this.children = children;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public User getOwner() {
-        return owner;
-    }
-
-    public void setOwner(User owner) {
-        this.owner = owner;
-    }
-
-    public Company getCompany() {
-        return company;
-    }
-
-    public void setCompany(Company company) {
-        this.company = company;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java b/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
deleted file mode 100644
index 256f261..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import com.casic.accessControl.feature.domain.Feature;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/17.
- */
-public class FeatureDto {
-    private Long id;
-    private Double longitude;
-    private Double latitude;
-    private String featureName;
-    private int type;
-    private Integer isValid;
-    private String memo;
-    private Long parentId;
-
-    private String btnEdit = "<a href='#' class='btn mini blue'><i class='icon-edit'></i>编辑</a>";
-    private String btnDelete = "<a href='#' class='btn mini red'><i class='icon-trash'></i>删除</a>";
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer getIsValid() {
-        return isValid;
-    }
-
-    public void setIsValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public Long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getBtnEdit() {
-        return btnEdit;
-    }
-
-    public void setBtnEdit(String btnEdit) {
-        this.btnEdit = btnEdit;
-    }
-
-    public String getBtnDelete() {
-        return btnDelete;
-    }
-
-    public void setBtnDelete(String btnDelete) {
-        this.btnDelete = btnDelete;
-    }
-
-    public static FeatureDto convert2FeatureDto(Feature feature) {
-        if (feature == null) {
-            return null;
-        }
-        FeatureDto featureDto = new FeatureDto();
-        featureDto.setId(feature.getId());
-        featureDto.setFeatureName(feature.getFeatureName());
-        featureDto.setIsValid(feature.isValid());
-        featureDto.setLatitude(feature.getLatitude());
-        featureDto.setLongitude(feature.getLongitude());
-        featureDto.setMemo(feature.getMemo());
-        featureDto.setType(feature.getType());
-        if (feature.getParent() != null)
-            featureDto.setParentId(feature.getParent().getId());
-        return featureDto;
-    }
-
-    public static List<FeatureDto> convert2FeatureDtos(List<Feature> features) {
-        List<FeatureDto> featureDtos = new ArrayList<FeatureDto>();
-        for (Feature feature : features) {
-            featureDtos.add(convert2FeatureDto(feature));
-        }
-        return featureDtos;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java b/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
deleted file mode 100644
index 785dcba..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/19.
- */
-public class OrgDto {
-    private long id;
-
-    private String name;
-
-    private long parentId;
-
-    private List<OrgDto> children = new ArrayList<OrgDto>();
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(long parentId) {
-        this.parentId = parentId;
-    }
-
-    public List<OrgDto> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<OrgDto> children) {
-        this.children = children;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java b/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
deleted file mode 100644
index a475e21..0000000
--- a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
+++ /dev/null
@@ -1,316 +0,0 @@
-package com.casic.accessControl.feature.manager;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.core.page.Page;
-import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.marker.manager.MarkerManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.DataTableParameter;
-import com.casic.accessControl.util.DataTableUtils;
-import org.apache.commons.collections.CollectionUtils;
-import org.hibernate.Criteria;
-import org.hibernate.Query;
-import org.hibernate.criterion.Restrictions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.jdbc.object.SqlQuery;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-@Service
-public class FeatureManager extends HibernateEntityDao<Feature> {
-
-    private Logger logger = LoggerFactory.getLogger(this.getClass());
-    @Resource
-    private MarkerManager markerManager;
-
-
-    public Feature getFeatureById(Long id) {
-        Feature feature = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("id", id)).add(Restrictions.eq("isValid", 1));
-            feature = (Feature) criteria.list().get(0);
-        } catch (Exception e) {
-            return null;
-        }
-        return feature;
-    }
-
-    public FeatureDto getFeatureDtoById(Long id) {
-        return FeatureDto.convert2FeatureDto(getFeatureById(id));
-    }
-
-    /**
-     * 根据id，软删除某个点或线或片
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param ids 多个id
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public String invalidFeature(String ids) {
-        if (StringUtils.isBlank(ids) || ids.indexOf(")") != -1) {//未传入值，直接返回，防止无效查询,过滤非法请求，防止sql注入
-            return "";
-        }
-        String[] idsArr = ids.split(",");
-        StringBuilder canDeleteIds = new StringBuilder("");
-        StringBuilder cantDeleleIds = new StringBuilder("");
-        //找出能删除的和不能删除的id组合
-        for (String id : idsArr) {
-            Long longId = Long.valueOf(id);
-            if (this.isCanDelete(longId)) {
-                if (canDeleteIds.length() > 0) {
-                    canDeleteIds.append(",");
-                }
-                canDeleteIds.append(id);
-
-            } else {
-                if (cantDeleleIds.length() > 0) {
-                    cantDeleleIds.append(",");
-                }
-                cantDeleleIds.append(id);
-            }
-        }
-
-        String temp1Ids = canDeleteIds.toString();
-        String temp2Ids = cantDeleleIds.toString();
-        if (StringUtils.isNotBlank(temp2Ids)) {//有不能删除的，都不删除
-            return "";
-        }
-        Query query = this.getSession().createQuery("update Feature f set f.isValid = 0 where id in (" + temp1Ids + ")");
-        query.executeUpdate();
-
-        return "success";
-    }
-
-    /**
-     * 判断feature是否可以删除
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param id
-     * @return
-     */
-    private boolean isCanDelete(Long id) {
-        Feature feature = this.getFeatureById(id);
-        if (feature.getParent() == null) {//所有用户共用的根节点不能删除
-            return false;
-        }
-        if (CollectionUtils.isNotEmpty(feature.getChildren())) {
-            for (Feature child : feature.getChildren()) {
-                if (child.isValid() == 1) {
-                    return false;
-                }
-            }
-
-        }
-        List<Marker> markers = markerManager.getMarkerByFeature(feature);
-        if (CollectionUtils.isNotEmpty(markers)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * 将数据库中的feature信息按照参数更新
-     *
-     * @param feature
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public void saveOrupdateFeature(Feature feature, User user) {
-        this.getSession().saveOrUpdate(feature);
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param user 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByUser")
-    public List<FeatureDto> getFeaturesByUser(Integer type, User user) {
-        if (user == null) {
-            return Collections.emptyList();
-        }
-        Company company = user.getCompany();
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("type", type));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-        return FeatureDto.convert2FeatureDtos(features);
-    }
-
-    /**
-     * 分页使用，datatable获取相应type的feature某页数据
-     *
-     * @param params
-     * @param user
-     * @return
-     */
-    public DataTable<FeatureDto> getPageFeatureListByTye(String params, Feature parent, User user) {
-        DataTable<FeatureDto> result = new DataTable<FeatureDto>();
-        DataTableParameter parameter = DataTableUtils.getDataTableParameterByJsonParam(params);
-        int start = parameter.getiDisplayStart();
-        int pageSize = parameter.getiDisplayLength();
-        int pageNo = (start / pageSize) + 1;
-        Criteria criteria = this.createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        Company company = user.getCompany();
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("isValid", 1)).add(Restrictions.eq("parent", parent));
-        Page page = pagedQuery(criteria, pageNo, pageSize);
-        List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos((List<Feature>) page.getResult());
-        result.setAaData(featureDtos);
-        result.setiTotalDisplayRecords((int) page.getTotalCount());
-        result.setiTotalRecords((int) page.getTotalCount());
-        result.setsEcho(parameter.getsEcho());
-        return result;
-
-
-    }
-
-    /**
-     * 获取层次结构列表,增加缓存
-     *
-     * @param type
-     * @param company
-     * @return
-     */
-    @Cacheable(value = "getOrgList")
-    public String getOrgList(Integer type, Company company) {
-        List<OrgDto> orgDtos = new ArrayList<OrgDto>();
-        List<Feature> features = this.getRootFeatures(type);
-        for (Feature feature : features) {
-            orgDtos.add(this.getChildrenByParentId(feature.getId(), company));
-        }
-        String jsonStr = null;
-        try {
-            jsonStr = new JsonMapper().toJson(orgDtos);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return jsonStr;
-    }
-
-    //    @Cacheable(value = "getChildrenByParentId", key = "#id")
-    public OrgDto getChildrenByParentId(Long id, Company company) {
-        if (id == null) {
-            return null;
-        }
-        Feature feature = getFeatureById(id);
-        if (feature == null) {
-            return null;
-        }
-        //创建OrgDto节点
-        OrgDto orgDto = new OrgDto();
-        orgDto.setId(id); //保存ID信息
-        orgDto.setName(feature.getFeatureName());
-        if (feature.getParent() != null) {
-            orgDto.setParentId(feature.getParent().getId());
-        }
-        List<Feature> departments = this.getActiveChildrenOrgs(feature, company);
-        for (Feature fea : departments) {
-            orgDto.getChildren().add(this.getChildrenByParentId(fea.getId(), company));
-        }
-        return orgDto;
-    }
-
-    //    @Cacheable(value = "getActiveChildrenOrgs", key = "#department.getId()")
-    private List<Feature> getActiveChildrenOrgs(Feature department, Company company) {
-        List<Feature> features = new ArrayList<Feature>();
-        for (Feature feature : department.getChildren()) {
-            if (feature.isValid() == 1 && feature.getCompany().getId().equals(company.getId())) {
-                features.add(feature);
-            }
-        }
-        return features;
-    }
-
-
-    public List<Feature> getRootFeatures(Integer type) {
-        List<Feature> features = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("type", type)).add(Restrictions.isNull("parent"));
-            features = criteria.list();
-        } catch (Exception e) {
-            return Collections.emptyList();
-        }
-        return features;
-
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param company 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByCompany", key = "#company.getId()")
-    public List<Feature> getFeaturesByCompany(Company company) {
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-        criteria.add(Restrictions.eq("company", company));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-
-        for (Feature f : features) {
-            f.getChildren().toString();
-            f.getOwner().toString();
-            if (f.getParent() != null)
-                f.getParent().toString();
-        }
-        return features;
-    }
-
-    /**
-     * 根据组织结构的id获取叶子节点
-     ***重要：**已更改为包含本节点****
-     * @param type
-     * @param feature
-     * @return
-     */
-    public List<Feature> getLeafByParentId(Integer type, Feature feature) {
-        if (feature == null || feature.isValid() == 0) return Collections.emptyList();
-        List<Feature> features = new ArrayList<Feature>();
-        if (CollectionUtils.isEmpty(feature.getChildren())) {
-            features.add(feature);
-            return features;
-        }
-        List<Feature> children = feature.getChildren();
-        boolean flag = false;
-        for (Feature child : children) {
-            if (child.isValid() == 1) {
-                flag = true;
-                features.addAll(getLeafByParentId(type, child));
-            }
-        }
-//        if (!flag) {//没有有效的子节点
-            features.add(feature);
-//        }
-        return features;
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java b/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
deleted file mode 100644
index a706a36..0000000
--- a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package com.casic.accessControl.feature.web;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.Role;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.CompanyManager;
-import com.casic.accessControl.user.manager.UserManager;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.StringUtils;
-import com.casic.accessControl.xls.Common;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import sun.org.mozilla.javascript.internal.EcmaError;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.IOException;
-import java.util.*;
-
-/**
- * 提供http访问接口
- * Created by lenovo on 2016/5/16.
- */
-@Controller
-@RequestMapping(value = "feature")
-public class FeatureController {
-    @Autowired
-    private FeatureManager featureManager;
-    @Autowired
-    private UserManager userManager;
-    @Autowired
-    private CompanyManager companyManager;
-
-    @RequestMapping(value = "org-list")
-    @ResponseBody
-    public String getOrgList(@RequestParam(required = true) Integer type, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Company company = user.getCompany();
-        return featureManager.getOrgList(type, company);
-    }
-
-    @RequestMapping(value = "org-list-na")
-    @ResponseBody
-    public Map<String, String> getOrgListNa(@RequestParam Long userId) {//na端所有传过来的userid都是公司id
-        Map<String, String> res = new HashMap<String, String>();
-        res.put("message", "列表获取失败");
-        try {
-//            User user = userManager.getUserById(userId);//获取当前登录用户
-//            Company company = user.getCompany();
-            Company company = companyManager.getCompanyById(userId);
-            String areas = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.AREA.getIndex(), company);
-            String lines = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.LINE.getIndex(), company);
-            res.put("feature", areas);
-            res.put("line", lines);
-        } catch (Exception e) {
-            return res;
-        }
-        res.put("message", "成功获取");
-        return res;
-    }
-
-    @RequestMapping(value = "getFeature")
-    @ResponseBody
-    public Map<String, Object> getFeaturesByUser(@RequestParam(required = true) Integer type, HttpSession session) {
-
-        Map<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        List<FeatureDto> list = featureManager.getFeaturesByUser(type, user);
-        if (list == null) {//获取列表失败
-            result.put("message", "获取列表出现错误");
-            return result;
-        } else {
-            result.put("data", list);
-            result.put("message", "获取列表成功");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "getSubFeatureList")
-    public void getSubFeatureList(@RequestParam(required = true) String jsonParams, @RequestParam(required = false) Long parentId, HttpServletResponse response, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Feature parent = featureManager.getFeatureById(parentId);
-        DataTable<FeatureDto> dtoDataTable = featureManager.getPageFeatureListByTye(jsonParams, parent, user);
-        Gson gson = new Gson();
-        String json = gson.toJson(dtoDataTable);
-        response.setCharacterEncoding("utf-8");
-        try {
-            response.getWriter().write(json);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @RequestMapping(value = "delete")
-    @ResponseBody
-    public Map<String, Object> deleteFeatureById(@RequestParam(required = true) Long id, HttpSession session) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        try {
-            String res = featureManager.invalidFeature(id.toString());
-            if (StringUtils.isBlank(res)) {
-                result.put("message", "删除失败");
-            } else {
-                result.put("message", "删除成功");
-                result.put("success", true);
-            }
-        } catch (Exception e) {
-            result.put("message", "删除失败");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "save")
-    @ResponseBody
-    public Map<String, Object> save(@RequestParam(required = true) String params, HttpSession session) {
-        Gson gson = new Gson();
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        Map markers = gson.fromJson(params, HashMap.class);
-        String featureName = (String) markers.get("featureName");
-        String memo = (String) markers.get("memo") == null ? "" : (String) markers.get("memo");
-        Long parentId = Long.valueOf(StringUtils.isBlank((String) markers.get("parentId")) ? "-1" : (String) markers.get("parentId"));//不知为什么转过来为Double
-        Long id = Long.valueOf(StringUtils.isBlank((String) markers.get("id")) ? "-1" : (String) markers.get("id"));
-
-
-        if (StringUtils.isBlank(featureName) || parentId.equals(-1L)) {
-            result.put("message", "必要参数未传送");
-            return result;
-        }
-        Feature feature = new Feature();
-        feature.setValid(1);
-        Feature parent = featureManager.getFeatureById(parentId);
-        feature.setParent(parent);
-        feature.setFeatureName(featureName);
-        feature.setMemo(memo);
-        feature.setOwner(user);
-        feature.setCompany(user.getCompany());
-        feature.setType(parent.getType());
-        if (!id.equals(-1L)) {
-            feature.setId(id);
-        }
-        try {
-            featureManager.saveOrupdateFeature(feature, user);
-            result.put("message", "保存成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "保存失败");
-        }
-        return result;
-
-    }
-
-
-    @RequestMapping(value = "getFeatureById")
-    @ResponseBody
-    public Map<String, Object> getFeatureById(@RequestParam(required = true) Long id) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        try {
-            FeatureDto feature = featureManager.getFeatureDtoById(id);
-            result.put("data", feature);
-            result.put("message", "获取成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "获取失败");
-        }
-        return result;
-
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
index 08a290e..3f53635 100644
--- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
+++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
@@ -1,6 +1,6 @@
 package com.casic.accessControl.marker.dto;
 
-import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.domain.Feature;
 import com.casic.accessControl.marker.domain.Marker;
 import org.apache.commons.collections.CollectionUtils;
 
diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
index 080b291..7fe7434 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -4,8 +4,6 @@
 import com.casic.accessControl.core.hibernate.HibernateEntityDao;
 import com.casic.accessControl.core.page.Page;
 import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.user.domain.Company;
@@ -49,9 +47,6 @@
 public class MarkerManager extends HibernateEntityDao<Marker> {
 
     @Resource
-    private FeatureManager featureManager;
-
-    @Resource
     private UserManager userInfoManager;
 
 
@@ -154,33 +149,33 @@
 
     //获取marker
 //    @Cacheable(value = "getMarkerByFeature", key = "#feature.getId()")
-    public List<Marker> getMarkerByFeature(Feature feature) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            criteria.add(Restrictions.eq("belongLine", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            criteria.add(Restrictions.eq("belongLine", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
-    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
-            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
+//            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
     public boolean saveMarker(Marker marker) {
         try {
@@ -465,7 +460,7 @@
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setLayStyle(sheet.getCell(indexMap.get("layStyle"), i).getContents());
-                } else if(recordTypeFlag == 4) {
+                } else if (recordTypeFlag == 4) {
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setBelowType(sheet.getCell(indexMap.get("belowType"), i).getContents());
diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
index a19f2f5..7675e1f 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -2,9 +2,6 @@
 
 import com.casic.accessControl.core.ext.export.CsvExportor;
 import com.casic.accessControl.core.ext.export.TableModel;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.manager.MarkerManager;
diff --git a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java b/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
deleted file mode 100644
index e69de29..0000000
--- a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
+++ /dev/null
diff --git a/src/main/java/com/casic/accessControl/rs/FeatureResource.java b/src/main/java/com/casic/accessControl/rs/FeatureResource.java
index 68aeb97..e97f18b 100644
--- a/src/main/java/com/casic/accessControl/rs/FeatureResource.java
+++ b/src/main/java/com/casic/accessControl/rs/FeatureResource.java
@@ -1,65 +1,65 @@
-package com.casic.accessControl.rs;
-
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.UserManager;
-import com.google.gson.Gson;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import javax.annotation.Resource;
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
-* Created by admin on 2015/1/15.
-*/
-@Component
-@Path("feature")
-public class FeatureResource
-{
-    private static Logger logger = LoggerFactory.getLogger(FeatureResource.class);
-
-    @Resource
-    private UserManager userManager;
-
-    @Resource
-    private FeatureManager featureManager;
-
-    @GET
-    @Path("get")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map get(@QueryParam("userName") String userName ){
-        Map map = new HashMap<String, Object>();
-        try {
-            User user = userManager.getUserByName(userName);
-            if (user == null) {
-                map.put("success", "false");
-                map.put("message", "人员不存在！");
-                return map;
-            }
-            Company company = user.getCompany();
-            if (company!=null)
-            {
-                List<Feature> features = featureManager.getFeaturesByCompany(company);
-                List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos(features);
-                map.put("success", "true");
-                map.put("message", featureDtos);
-            }
-        }
-        catch (Exception e)
-        {
-            map.put("success", "false");
-            map.put("message", e.getMessage());
-        }
-        return  map;
-    }
-}
+//package com.casic.accessControl.rs;
+//
+//import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.dto.FeatureDto;
+//import com.casic.accessControl.feature.manager.FeatureManager;
+//import com.casic.accessControl.user.domain.Company;
+//import com.casic.accessControl.user.domain.User;
+//import com.casic.accessControl.user.manager.UserManager;
+//import com.google.gson.Gson;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.stereotype.Component;
+//import org.springframework.web.bind.annotation.RequestParam;
+//
+//import javax.annotation.Resource;
+//import javax.ws.rs.*;
+//import javax.ws.rs.core.MediaType;
+//import java.util.HashMap;
+//import java.util.List;
+//import java.util.Map;
+//
+///**
+//* Created by admin on 2015/1/15.
+//*/
+//@Component
+//@Path("feature")
+//public class FeatureResource
+//{
+//    private static Logger logger = LoggerFactory.getLogger(FeatureResource.class);
+//
+//    @Resource
+//    private UserManager userManager;
+//
+//    @Resource
+//    private FeatureManager featureManager;
+//
+//    @GET
+//    @Path("get")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public Map get(@QueryParam("userName") String userName ){
+//        Map map = new HashMap<String, Object>();
+//        try {
+//            User user = userManager.getUserByName(userName);
+//            if (user == null) {
+//                map.put("success", "false");
+//                map.put("message", "人员不存在！");
+//                return map;
+//            }
+//            Company company = user.getCompany();
+//            if (company!=null)
+//            {
+//                List<Feature> features = featureManager.getFeaturesByCompany(company);
+//                List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos(features);
+//                map.put("success", "true");
+//                map.put("message", featureDtos);
+//            }
+//        }
+//        catch (Exception e)
+//        {
+//            map.put("success", "false");
+//            map.put("message", e.getMessage());
+//        }
+//        return  map;
+//    }
+//}
diff --git a/src/main/java/com/casic/accessControl/rs/MapInfo.java b/src/main/java/com/casic/accessControl/rs/MapInfo.java
deleted file mode 100644
index a77fce9..0000000
--- a/src/main/java/com/casic/accessControl/rs/MapInfo.java
+++ /dev/null
@@ -1,131 +0,0 @@
-//package com.casic.accessControl.rs;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-///**
-// * Created by admin on 2015/8/26.
-// */
-//public class MapInfo {
-//
-//    private String mapUrl;
-//
-//    private String updateTime;
-//
-//    private String uploader;
-//
-//    private String name;
-//
-//    private String uuid;
-//
-//    private String site;
-//    /*
-//    0:草稿
-//    1：待审核
-//    2：通过
-//    3: 驳回
-//     */
-//    private String status;
-//
-//    //
-//    private int id;
-//
-//
-//    public String getMapUrl()
-//    {
-//        return mapUrl;
-//    }
-//
-//    public void setMapUrl(String mapUrl)
-//    {
-//        this.mapUrl = mapUrl;
-//    }
-//
-//    public String getUpdateTime()
-//    {
-//        return updateTime;
-//    }
-//
-//    public void setUpdateTime(String updateTime)
-//    {
-//        this.updateTime = updateTime;
-//    }
-//
-//    public String getUploader()
-//    {
-//        return uploader;
-//    }
-//
-//    public void setUploader(String uploader)
-//    {
-//        this.uploader = uploader;
-//    }
-//
-//    public String getName()
-//    {
-//        return name;
-//    }
-//
-//    public void setName(String name)
-//    {
-//        this.name = name;
-//    }
-//
-//    public String getUuid()
-//    {
-//        return uuid;
-//    }
-//
-//    public void setUuid(String uuid)
-//    {
-//        this.uuid = uuid;
-//    }
-//
-//    public String getSite()
-//    {
-//        return site;
-//    }
-//
-//    public void setSite(String site)
-//    {
-//        this.site = site;
-//    }
-//
-//    public String getStatus()
-//    {
-//        return status;
-//    }
-//
-//    public void setStatus(String status)
-//    {
-//        this.status = status;
-//    }
-//
-//    public int getId()
-//    {
-//        return id;
-//    }
-//
-//    public void setId(int id)
-//    {
-//        this.id = id;
-//    }
-//
-//    public static List<MapInfo> getMockerMaps()
-//    {
-//        List<MapInfo> maps = new ArrayList<MapInfo>();
-//        for (int i = 0; i < 20; i++)
-//        {
-//            MapInfo map = new MapInfo();
-//            map.setId(i);
-//            map.setUploader("张帆");
-//            map.setMapUrl("http://192.168.0.111:9080/accessControl/logo.jpg");
-//            map.setSite("永旺路"+i);
-//            map.setUpdateTime("2015-08-02");
-//            map.setStatus("待审核");
-//            maps.add(map);
-//        }
-//        return maps;
-//
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/rs/MarkResource.java b/src/main/java/com/casic/accessControl/rs/MarkResource.java
index 8ae4d85..cef1580 100644
--- a/src/main/java/com/casic/accessControl/rs/MarkResource.java
+++ b/src/main/java/com/casic/accessControl/rs/MarkResource.java
@@ -1,7 +1,7 @@
 package com.casic.accessControl.rs;
 
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
+//import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.manager.MarkerManager;
 import com.casic.accessControl.user.domain.Company;
@@ -35,8 +35,8 @@
     @Resource
     private MarkerManager markerManager;
 
-    @Resource
-    private FeatureManager featureManager;
+//    @Resource
+//    private FeatureManager featureManager;
 
     @GET
     @Path("post")
diff --git a/src/main/java/com/casic/accessControl/rs/UserObj.java b/src/main/java/com/casic/accessControl/rs/UserObj.java
deleted file mode 100644
index c0fe651..0000000
--- a/src/main/java/com/casic/accessControl/rs/UserObj.java
+++ /dev/null
@@ -1,61 +0,0 @@
-//package com.casic.accessControl.rs;
-//
-//import java.io.Serializable;
-//
-///**
-// * Created by admin on 2015/10/9.
-// */
-//public class UserObj implements Serializable {
-//    private String userName;
-//    private String password;
-//    private String appId;
-//    /*
-//    roles:��ɫ֮���Զ��ŷָ�
-//     */
-//    private String roles;
-//
-//    /*
-//    authorities:Ȩ��֮���Զ��ŷָ�
-//    */
-//    private String authorities;
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public String getPassword() {
-//        return password;
-//    }
-//
-//    public void setPassword(String password) {
-//        this.password = password;
-//    }
-//
-//    public String getAppId() {
-//        return appId;
-//    }
-//
-//    public void setAppId(String appId) {
-//        this.appId = appId;
-//    }
-//
-//    public String getRoles() {
-//        return roles;
-//    }
-//
-//    public void setRoles(String roles) {
-//        this.roles = roles;
-//    }
-//
-//    public String getAuthorities() {
-//        return authorities;
-//    }
-//
-//    public void setAuthorities(String authorities) {
-//        this.authorities = authorities;
-//    }
-//}

diff --git a/src/main/java/com/casic/accessControl/feature/domain/Feature.java b/src/main/java/com/casic/accessControl/feature/domain/Feature.java
deleted file mode 100644
index c89a0c2..0000000
--- a/src/main/java/com/casic/accessControl/feature/domain/Feature.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.casic.accessControl.feature.domain;
-
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-
-import javax.persistence.*;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-//点的信息
-@Entity
-@Table(name = "feature")
-public class Feature {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private Long id;
-    @Column(name = "longitude")
-    private Double longitude;
-    @Column(name = "latitude")
-    private Double latitude;
-    @Column(name = "featureName")
-    private String featureName;
-    @Column(name = "type")
-    private int type;
-    @Column(name = "isValid")
-    private Integer isValid;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "parent")
-    private Feature parent;
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "parent")
-    private List<Feature> children;
-    @Column(name = "memo")
-    private String memo;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "owner", referencedColumnName = "id")
-    private User owner;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "company", referencedColumnName = "id")
-    private Company company;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer isValid() {
-        return isValid;
-    }
-
-    public void setValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public Feature getParent() {
-        return parent;
-    }
-
-    public void setParent(Feature parent) {
-        this.parent = parent;
-    }
-
-    public List<Feature> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<Feature> children) {
-        this.children = children;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public User getOwner() {
-        return owner;
-    }
-
-    public void setOwner(User owner) {
-        this.owner = owner;
-    }
-
-    public Company getCompany() {
-        return company;
-    }
-
-    public void setCompany(Company company) {
-        this.company = company;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java b/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
deleted file mode 100644
index 256f261..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import com.casic.accessControl.feature.domain.Feature;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/17.
- */
-public class FeatureDto {
-    private Long id;
-    private Double longitude;
-    private Double latitude;
-    private String featureName;
-    private int type;
-    private Integer isValid;
-    private String memo;
-    private Long parentId;
-
-    private String btnEdit = "<a href='#' class='btn mini blue'><i class='icon-edit'></i>编辑</a>";
-    private String btnDelete = "<a href='#' class='btn mini red'><i class='icon-trash'></i>删除</a>";
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer getIsValid() {
-        return isValid;
-    }
-
-    public void setIsValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public Long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getBtnEdit() {
-        return btnEdit;
-    }
-
-    public void setBtnEdit(String btnEdit) {
-        this.btnEdit = btnEdit;
-    }
-
-    public String getBtnDelete() {
-        return btnDelete;
-    }
-
-    public void setBtnDelete(String btnDelete) {
-        this.btnDelete = btnDelete;
-    }
-
-    public static FeatureDto convert2FeatureDto(Feature feature) {
-        if (feature == null) {
-            return null;
-        }
-        FeatureDto featureDto = new FeatureDto();
-        featureDto.setId(feature.getId());
-        featureDto.setFeatureName(feature.getFeatureName());
-        featureDto.setIsValid(feature.isValid());
-        featureDto.setLatitude(feature.getLatitude());
-        featureDto.setLongitude(feature.getLongitude());
-        featureDto.setMemo(feature.getMemo());
-        featureDto.setType(feature.getType());
-        if (feature.getParent() != null)
-            featureDto.setParentId(feature.getParent().getId());
-        return featureDto;
-    }
-
-    public static List<FeatureDto> convert2FeatureDtos(List<Feature> features) {
-        List<FeatureDto> featureDtos = new ArrayList<FeatureDto>();
-        for (Feature feature : features) {
-            featureDtos.add(convert2FeatureDto(feature));
-        }
-        return featureDtos;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java b/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
deleted file mode 100644
index 785dcba..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/19.
- */
-public class OrgDto {
-    private long id;
-
-    private String name;
-
-    private long parentId;
-
-    private List<OrgDto> children = new ArrayList<OrgDto>();
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(long parentId) {
-        this.parentId = parentId;
-    }
-
-    public List<OrgDto> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<OrgDto> children) {
-        this.children = children;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java b/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
deleted file mode 100644
index a475e21..0000000
--- a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
+++ /dev/null
@@ -1,316 +0,0 @@
-package com.casic.accessControl.feature.manager;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.core.page.Page;
-import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.marker.manager.MarkerManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.DataTableParameter;
-import com.casic.accessControl.util.DataTableUtils;
-import org.apache.commons.collections.CollectionUtils;
-import org.hibernate.Criteria;
-import org.hibernate.Query;
-import org.hibernate.criterion.Restrictions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.jdbc.object.SqlQuery;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-@Service
-public class FeatureManager extends HibernateEntityDao<Feature> {
-
-    private Logger logger = LoggerFactory.getLogger(this.getClass());
-    @Resource
-    private MarkerManager markerManager;
-
-
-    public Feature getFeatureById(Long id) {
-        Feature feature = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("id", id)).add(Restrictions.eq("isValid", 1));
-            feature = (Feature) criteria.list().get(0);
-        } catch (Exception e) {
-            return null;
-        }
-        return feature;
-    }
-
-    public FeatureDto getFeatureDtoById(Long id) {
-        return FeatureDto.convert2FeatureDto(getFeatureById(id));
-    }
-
-    /**
-     * 根据id，软删除某个点或线或片
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param ids 多个id
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public String invalidFeature(String ids) {
-        if (StringUtils.isBlank(ids) || ids.indexOf(")") != -1) {//未传入值，直接返回，防止无效查询,过滤非法请求，防止sql注入
-            return "";
-        }
-        String[] idsArr = ids.split(",");
-        StringBuilder canDeleteIds = new StringBuilder("");
-        StringBuilder cantDeleleIds = new StringBuilder("");
-        //找出能删除的和不能删除的id组合
-        for (String id : idsArr) {
-            Long longId = Long.valueOf(id);
-            if (this.isCanDelete(longId)) {
-                if (canDeleteIds.length() > 0) {
-                    canDeleteIds.append(",");
-                }
-                canDeleteIds.append(id);
-
-            } else {
-                if (cantDeleleIds.length() > 0) {
-                    cantDeleleIds.append(",");
-                }
-                cantDeleleIds.append(id);
-            }
-        }
-
-        String temp1Ids = canDeleteIds.toString();
-        String temp2Ids = cantDeleleIds.toString();
-        if (StringUtils.isNotBlank(temp2Ids)) {//有不能删除的，都不删除
-            return "";
-        }
-        Query query = this.getSession().createQuery("update Feature f set f.isValid = 0 where id in (" + temp1Ids + ")");
-        query.executeUpdate();
-
-        return "success";
-    }
-
-    /**
-     * 判断feature是否可以删除
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param id
-     * @return
-     */
-    private boolean isCanDelete(Long id) {
-        Feature feature = this.getFeatureById(id);
-        if (feature.getParent() == null) {//所有用户共用的根节点不能删除
-            return false;
-        }
-        if (CollectionUtils.isNotEmpty(feature.getChildren())) {
-            for (Feature child : feature.getChildren()) {
-                if (child.isValid() == 1) {
-                    return false;
-                }
-            }
-
-        }
-        List<Marker> markers = markerManager.getMarkerByFeature(feature);
-        if (CollectionUtils.isNotEmpty(markers)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * 将数据库中的feature信息按照参数更新
-     *
-     * @param feature
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public void saveOrupdateFeature(Feature feature, User user) {
-        this.getSession().saveOrUpdate(feature);
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param user 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByUser")
-    public List<FeatureDto> getFeaturesByUser(Integer type, User user) {
-        if (user == null) {
-            return Collections.emptyList();
-        }
-        Company company = user.getCompany();
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("type", type));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-        return FeatureDto.convert2FeatureDtos(features);
-    }
-
-    /**
-     * 分页使用，datatable获取相应type的feature某页数据
-     *
-     * @param params
-     * @param user
-     * @return
-     */
-    public DataTable<FeatureDto> getPageFeatureListByTye(String params, Feature parent, User user) {
-        DataTable<FeatureDto> result = new DataTable<FeatureDto>();
-        DataTableParameter parameter = DataTableUtils.getDataTableParameterByJsonParam(params);
-        int start = parameter.getiDisplayStart();
-        int pageSize = parameter.getiDisplayLength();
-        int pageNo = (start / pageSize) + 1;
-        Criteria criteria = this.createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        Company company = user.getCompany();
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("isValid", 1)).add(Restrictions.eq("parent", parent));
-        Page page = pagedQuery(criteria, pageNo, pageSize);
-        List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos((List<Feature>) page.getResult());
-        result.setAaData(featureDtos);
-        result.setiTotalDisplayRecords((int) page.getTotalCount());
-        result.setiTotalRecords((int) page.getTotalCount());
-        result.setsEcho(parameter.getsEcho());
-        return result;
-
-
-    }
-
-    /**
-     * 获取层次结构列表,增加缓存
-     *
-     * @param type
-     * @param company
-     * @return
-     */
-    @Cacheable(value = "getOrgList")
-    public String getOrgList(Integer type, Company company) {
-        List<OrgDto> orgDtos = new ArrayList<OrgDto>();
-        List<Feature> features = this.getRootFeatures(type);
-        for (Feature feature : features) {
-            orgDtos.add(this.getChildrenByParentId(feature.getId(), company));
-        }
-        String jsonStr = null;
-        try {
-            jsonStr = new JsonMapper().toJson(orgDtos);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return jsonStr;
-    }
-
-    //    @Cacheable(value = "getChildrenByParentId", key = "#id")
-    public OrgDto getChildrenByParentId(Long id, Company company) {
-        if (id == null) {
-            return null;
-        }
-        Feature feature = getFeatureById(id);
-        if (feature == null) {
-            return null;
-        }
-        //创建OrgDto节点
-        OrgDto orgDto = new OrgDto();
-        orgDto.setId(id); //保存ID信息
-        orgDto.setName(feature.getFeatureName());
-        if (feature.getParent() != null) {
-            orgDto.setParentId(feature.getParent().getId());
-        }
-        List<Feature> departments = this.getActiveChildrenOrgs(feature, company);
-        for (Feature fea : departments) {
-            orgDto.getChildren().add(this.getChildrenByParentId(fea.getId(), company));
-        }
-        return orgDto;
-    }
-
-    //    @Cacheable(value = "getActiveChildrenOrgs", key = "#department.getId()")
-    private List<Feature> getActiveChildrenOrgs(Feature department, Company company) {
-        List<Feature> features = new ArrayList<Feature>();
-        for (Feature feature : department.getChildren()) {
-            if (feature.isValid() == 1 && feature.getCompany().getId().equals(company.getId())) {
-                features.add(feature);
-            }
-        }
-        return features;
-    }
-
-
-    public List<Feature> getRootFeatures(Integer type) {
-        List<Feature> features = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("type", type)).add(Restrictions.isNull("parent"));
-            features = criteria.list();
-        } catch (Exception e) {
-            return Collections.emptyList();
-        }
-        return features;
-
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param company 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByCompany", key = "#company.getId()")
-    public List<Feature> getFeaturesByCompany(Company company) {
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-        criteria.add(Restrictions.eq("company", company));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-
-        for (Feature f : features) {
-            f.getChildren().toString();
-            f.getOwner().toString();
-            if (f.getParent() != null)
-                f.getParent().toString();
-        }
-        return features;
-    }
-
-    /**
-     * 根据组织结构的id获取叶子节点
-     ***重要：**已更改为包含本节点****
-     * @param type
-     * @param feature
-     * @return
-     */
-    public List<Feature> getLeafByParentId(Integer type, Feature feature) {
-        if (feature == null || feature.isValid() == 0) return Collections.emptyList();
-        List<Feature> features = new ArrayList<Feature>();
-        if (CollectionUtils.isEmpty(feature.getChildren())) {
-            features.add(feature);
-            return features;
-        }
-        List<Feature> children = feature.getChildren();
-        boolean flag = false;
-        for (Feature child : children) {
-            if (child.isValid() == 1) {
-                flag = true;
-                features.addAll(getLeafByParentId(type, child));
-            }
-        }
-//        if (!flag) {//没有有效的子节点
-            features.add(feature);
-//        }
-        return features;
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java b/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
deleted file mode 100644
index a706a36..0000000
--- a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package com.casic.accessControl.feature.web;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.Role;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.CompanyManager;
-import com.casic.accessControl.user.manager.UserManager;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.StringUtils;
-import com.casic.accessControl.xls.Common;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import sun.org.mozilla.javascript.internal.EcmaError;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.IOException;
-import java.util.*;
-
-/**
- * 提供http访问接口
- * Created by lenovo on 2016/5/16.
- */
-@Controller
-@RequestMapping(value = "feature")
-public class FeatureController {
-    @Autowired
-    private FeatureManager featureManager;
-    @Autowired
-    private UserManager userManager;
-    @Autowired
-    private CompanyManager companyManager;
-
-    @RequestMapping(value = "org-list")
-    @ResponseBody
-    public String getOrgList(@RequestParam(required = true) Integer type, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Company company = user.getCompany();
-        return featureManager.getOrgList(type, company);
-    }
-
-    @RequestMapping(value = "org-list-na")
-    @ResponseBody
-    public Map<String, String> getOrgListNa(@RequestParam Long userId) {//na端所有传过来的userid都是公司id
-        Map<String, String> res = new HashMap<String, String>();
-        res.put("message", "列表获取失败");
-        try {
-//            User user = userManager.getUserById(userId);//获取当前登录用户
-//            Company company = user.getCompany();
-            Company company = companyManager.getCompanyById(userId);
-            String areas = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.AREA.getIndex(), company);
-            String lines = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.LINE.getIndex(), company);
-            res.put("feature", areas);
-            res.put("line", lines);
-        } catch (Exception e) {
-            return res;
-        }
-        res.put("message", "成功获取");
-        return res;
-    }
-
-    @RequestMapping(value = "getFeature")
-    @ResponseBody
-    public Map<String, Object> getFeaturesByUser(@RequestParam(required = true) Integer type, HttpSession session) {
-
-        Map<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        List<FeatureDto> list = featureManager.getFeaturesByUser(type, user);
-        if (list == null) {//获取列表失败
-            result.put("message", "获取列表出现错误");
-            return result;
-        } else {
-            result.put("data", list);
-            result.put("message", "获取列表成功");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "getSubFeatureList")
-    public void getSubFeatureList(@RequestParam(required = true) String jsonParams, @RequestParam(required = false) Long parentId, HttpServletResponse response, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Feature parent = featureManager.getFeatureById(parentId);
-        DataTable<FeatureDto> dtoDataTable = featureManager.getPageFeatureListByTye(jsonParams, parent, user);
-        Gson gson = new Gson();
-        String json = gson.toJson(dtoDataTable);
-        response.setCharacterEncoding("utf-8");
-        try {
-            response.getWriter().write(json);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @RequestMapping(value = "delete")
-    @ResponseBody
-    public Map<String, Object> deleteFeatureById(@RequestParam(required = true) Long id, HttpSession session) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        try {
-            String res = featureManager.invalidFeature(id.toString());
-            if (StringUtils.isBlank(res)) {
-                result.put("message", "删除失败");
-            } else {
-                result.put("message", "删除成功");
-                result.put("success", true);
-            }
-        } catch (Exception e) {
-            result.put("message", "删除失败");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "save")
-    @ResponseBody
-    public Map<String, Object> save(@RequestParam(required = true) String params, HttpSession session) {
-        Gson gson = new Gson();
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        Map markers = gson.fromJson(params, HashMap.class);
-        String featureName = (String) markers.get("featureName");
-        String memo = (String) markers.get("memo") == null ? "" : (String) markers.get("memo");
-        Long parentId = Long.valueOf(StringUtils.isBlank((String) markers.get("parentId")) ? "-1" : (String) markers.get("parentId"));//不知为什么转过来为Double
-        Long id = Long.valueOf(StringUtils.isBlank((String) markers.get("id")) ? "-1" : (String) markers.get("id"));
-
-
-        if (StringUtils.isBlank(featureName) || parentId.equals(-1L)) {
-            result.put("message", "必要参数未传送");
-            return result;
-        }
-        Feature feature = new Feature();
-        feature.setValid(1);
-        Feature parent = featureManager.getFeatureById(parentId);
-        feature.setParent(parent);
-        feature.setFeatureName(featureName);
-        feature.setMemo(memo);
-        feature.setOwner(user);
-        feature.setCompany(user.getCompany());
-        feature.setType(parent.getType());
-        if (!id.equals(-1L)) {
-            feature.setId(id);
-        }
-        try {
-            featureManager.saveOrupdateFeature(feature, user);
-            result.put("message", "保存成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "保存失败");
-        }
-        return result;
-
-    }
-
-
-    @RequestMapping(value = "getFeatureById")
-    @ResponseBody
-    public Map<String, Object> getFeatureById(@RequestParam(required = true) Long id) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        try {
-            FeatureDto feature = featureManager.getFeatureDtoById(id);
-            result.put("data", feature);
-            result.put("message", "获取成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "获取失败");
-        }
-        return result;
-
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
index 08a290e..3f53635 100644
--- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
+++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
@@ -1,6 +1,6 @@
 package com.casic.accessControl.marker.dto;
 
-import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.domain.Feature;
 import com.casic.accessControl.marker.domain.Marker;
 import org.apache.commons.collections.CollectionUtils;
 
diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
index 080b291..7fe7434 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -4,8 +4,6 @@
 import com.casic.accessControl.core.hibernate.HibernateEntityDao;
 import com.casic.accessControl.core.page.Page;
 import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.user.domain.Company;
@@ -49,9 +47,6 @@
 public class MarkerManager extends HibernateEntityDao<Marker> {
 
     @Resource
-    private FeatureManager featureManager;
-
-    @Resource
     private UserManager userInfoManager;
 
 
@@ -154,33 +149,33 @@
 
     //获取marker
 //    @Cacheable(value = "getMarkerByFeature", key = "#feature.getId()")
-    public List<Marker> getMarkerByFeature(Feature feature) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            criteria.add(Restrictions.eq("belongLine", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            criteria.add(Restrictions.eq("belongLine", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
-    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
-            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
+//            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
     public boolean saveMarker(Marker marker) {
         try {
@@ -465,7 +460,7 @@
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setLayStyle(sheet.getCell(indexMap.get("layStyle"), i).getContents());
-                } else if(recordTypeFlag == 4) {
+                } else if (recordTypeFlag == 4) {
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setBelowType(sheet.getCell(indexMap.get("belowType"), i).getContents());
diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
index a19f2f5..7675e1f 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -2,9 +2,6 @@
 
 import com.casic.accessControl.core.ext.export.CsvExportor;
 import com.casic.accessControl.core.ext.export.TableModel;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.manager.MarkerManager;
diff --git a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java b/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
deleted file mode 100644
index e69de29..0000000
--- a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
+++ /dev/null
diff --git a/src/main/java/com/casic/accessControl/rs/FeatureResource.java b/src/main/java/com/casic/accessControl/rs/FeatureResource.java
index 68aeb97..e97f18b 100644
--- a/src/main/java/com/casic/accessControl/rs/FeatureResource.java
+++ b/src/main/java/com/casic/accessControl/rs/FeatureResource.java
@@ -1,65 +1,65 @@
-package com.casic.accessControl.rs;
-
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.UserManager;
-import com.google.gson.Gson;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import javax.annotation.Resource;
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
-* Created by admin on 2015/1/15.
-*/
-@Component
-@Path("feature")
-public class FeatureResource
-{
-    private static Logger logger = LoggerFactory.getLogger(FeatureResource.class);
-
-    @Resource
-    private UserManager userManager;
-
-    @Resource
-    private FeatureManager featureManager;
-
-    @GET
-    @Path("get")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map get(@QueryParam("userName") String userName ){
-        Map map = new HashMap<String, Object>();
-        try {
-            User user = userManager.getUserByName(userName);
-            if (user == null) {
-                map.put("success", "false");
-                map.put("message", "人员不存在！");
-                return map;
-            }
-            Company company = user.getCompany();
-            if (company!=null)
-            {
-                List<Feature> features = featureManager.getFeaturesByCompany(company);
-                List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos(features);
-                map.put("success", "true");
-                map.put("message", featureDtos);
-            }
-        }
-        catch (Exception e)
-        {
-            map.put("success", "false");
-            map.put("message", e.getMessage());
-        }
-        return  map;
-    }
-}
+//package com.casic.accessControl.rs;
+//
+//import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.dto.FeatureDto;
+//import com.casic.accessControl.feature.manager.FeatureManager;
+//import com.casic.accessControl.user.domain.Company;
+//import com.casic.accessControl.user.domain.User;
+//import com.casic.accessControl.user.manager.UserManager;
+//import com.google.gson.Gson;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.stereotype.Component;
+//import org.springframework.web.bind.annotation.RequestParam;
+//
+//import javax.annotation.Resource;
+//import javax.ws.rs.*;
+//import javax.ws.rs.core.MediaType;
+//import java.util.HashMap;
+//import java.util.List;
+//import java.util.Map;
+//
+///**
+//* Created by admin on 2015/1/15.
+//*/
+//@Component
+//@Path("feature")
+//public class FeatureResource
+//{
+//    private static Logger logger = LoggerFactory.getLogger(FeatureResource.class);
+//
+//    @Resource
+//    private UserManager userManager;
+//
+//    @Resource
+//    private FeatureManager featureManager;
+//
+//    @GET
+//    @Path("get")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public Map get(@QueryParam("userName") String userName ){
+//        Map map = new HashMap<String, Object>();
+//        try {
+//            User user = userManager.getUserByName(userName);
+//            if (user == null) {
+//                map.put("success", "false");
+//                map.put("message", "人员不存在！");
+//                return map;
+//            }
+//            Company company = user.getCompany();
+//            if (company!=null)
+//            {
+//                List<Feature> features = featureManager.getFeaturesByCompany(company);
+//                List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos(features);
+//                map.put("success", "true");
+//                map.put("message", featureDtos);
+//            }
+//        }
+//        catch (Exception e)
+//        {
+//            map.put("success", "false");
+//            map.put("message", e.getMessage());
+//        }
+//        return  map;
+//    }
+//}
diff --git a/src/main/java/com/casic/accessControl/rs/MapInfo.java b/src/main/java/com/casic/accessControl/rs/MapInfo.java
deleted file mode 100644
index a77fce9..0000000
--- a/src/main/java/com/casic/accessControl/rs/MapInfo.java
+++ /dev/null
@@ -1,131 +0,0 @@
-//package com.casic.accessControl.rs;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-///**
-// * Created by admin on 2015/8/26.
-// */
-//public class MapInfo {
-//
-//    private String mapUrl;
-//
-//    private String updateTime;
-//
-//    private String uploader;
-//
-//    private String name;
-//
-//    private String uuid;
-//
-//    private String site;
-//    /*
-//    0:草稿
-//    1：待审核
-//    2：通过
-//    3: 驳回
-//     */
-//    private String status;
-//
-//    //
-//    private int id;
-//
-//
-//    public String getMapUrl()
-//    {
-//        return mapUrl;
-//    }
-//
-//    public void setMapUrl(String mapUrl)
-//    {
-//        this.mapUrl = mapUrl;
-//    }
-//
-//    public String getUpdateTime()
-//    {
-//        return updateTime;
-//    }
-//
-//    public void setUpdateTime(String updateTime)
-//    {
-//        this.updateTime = updateTime;
-//    }
-//
-//    public String getUploader()
-//    {
-//        return uploader;
-//    }
-//
-//    public void setUploader(String uploader)
-//    {
-//        this.uploader = uploader;
-//    }
-//
-//    public String getName()
-//    {
-//        return name;
-//    }
-//
-//    public void setName(String name)
-//    {
-//        this.name = name;
-//    }
-//
-//    public String getUuid()
-//    {
-//        return uuid;
-//    }
-//
-//    public void setUuid(String uuid)
-//    {
-//        this.uuid = uuid;
-//    }
-//
-//    public String getSite()
-//    {
-//        return site;
-//    }
-//
-//    public void setSite(String site)
-//    {
-//        this.site = site;
-//    }
-//
-//    public String getStatus()
-//    {
-//        return status;
-//    }
-//
-//    public void setStatus(String status)
-//    {
-//        this.status = status;
-//    }
-//
-//    public int getId()
-//    {
-//        return id;
-//    }
-//
-//    public void setId(int id)
-//    {
-//        this.id = id;
-//    }
-//
-//    public static List<MapInfo> getMockerMaps()
-//    {
-//        List<MapInfo> maps = new ArrayList<MapInfo>();
-//        for (int i = 0; i < 20; i++)
-//        {
-//            MapInfo map = new MapInfo();
-//            map.setId(i);
-//            map.setUploader("张帆");
-//            map.setMapUrl("http://192.168.0.111:9080/accessControl/logo.jpg");
-//            map.setSite("永旺路"+i);
-//            map.setUpdateTime("2015-08-02");
-//            map.setStatus("待审核");
-//            maps.add(map);
-//        }
-//        return maps;
-//
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/rs/MarkResource.java b/src/main/java/com/casic/accessControl/rs/MarkResource.java
index 8ae4d85..cef1580 100644
--- a/src/main/java/com/casic/accessControl/rs/MarkResource.java
+++ b/src/main/java/com/casic/accessControl/rs/MarkResource.java
@@ -1,7 +1,7 @@
 package com.casic.accessControl.rs;
 
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
+//import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.manager.MarkerManager;
 import com.casic.accessControl.user.domain.Company;
@@ -35,8 +35,8 @@
     @Resource
     private MarkerManager markerManager;
 
-    @Resource
-    private FeatureManager featureManager;
+//    @Resource
+//    private FeatureManager featureManager;
 
     @GET
     @Path("post")
diff --git a/src/main/java/com/casic/accessControl/rs/UserObj.java b/src/main/java/com/casic/accessControl/rs/UserObj.java
deleted file mode 100644
index c0fe651..0000000
--- a/src/main/java/com/casic/accessControl/rs/UserObj.java
+++ /dev/null
@@ -1,61 +0,0 @@
-//package com.casic.accessControl.rs;
-//
-//import java.io.Serializable;
-//
-///**
-// * Created by admin on 2015/10/9.
-// */
-//public class UserObj implements Serializable {
-//    private String userName;
-//    private String password;
-//    private String appId;
-//    /*
-//    roles:��ɫ֮���Զ��ŷָ�
-//     */
-//    private String roles;
-//
-//    /*
-//    authorities:Ȩ��֮���Զ��ŷָ�
-//    */
-//    private String authorities;
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public String getPassword() {
-//        return password;
-//    }
-//
-//    public void setPassword(String password) {
-//        this.password = password;
-//    }
-//
-//    public String getAppId() {
-//        return appId;
-//    }
-//
-//    public void setAppId(String appId) {
-//        this.appId = appId;
-//    }
-//
-//    public String getRoles() {
-//        return roles;
-//    }
-//
-//    public void setRoles(String roles) {
-//        this.roles = roles;
-//    }
-//
-//    public String getAuthorities() {
-//        return authorities;
-//    }
-//
-//    public void setAuthorities(String authorities) {
-//        this.authorities = authorities;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java b/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java
deleted file mode 100644
index ac60ed5..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java
+++ /dev/null
@@ -1,65 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//import org.geotools.referencing.operation.transform.NADCONTransform;
-//
-//import javax.persistence.*;
-//
-///**
-// * Created by test203 on 2015/10/29.
-// */
-//@Entity
-//@Table(name = "ZX_DATABASE_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_DATABASE_INFO_ID", sequenceName = "SEQ_ZX_DATABASE_INFO_ID", allocationSize = 1, initialValue = 1)
-//public class DataBaseInfo {
-//    private Long id;
-//    private String account;
-//    private String password;
-//    private String sid;
-//    private String owner;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_ZX_DATABASE_INFO_ID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "ACCOUNT", nullable = false)
-//    public String getAccount() {
-//        return account;
-//    }
-//
-//    public void setAccount(String account) {
-//        this.account = account;
-//    }
-//
-//    @Column(name = "PASSWORD", nullable = false)
-//    public String getPassword() {
-//        return password;
-//    }
-//
-//    public void setPassword(String password) {
-//        this.password = password;
-//    }
-//
-//    @Column(name = "SID", nullable = false)
-//    public String getSid() {
-//        return sid;
-//    }
-//
-//    public void setSid(String sid) {
-//        this.sid = sid;
-//    }
-//
-//    @Column(name = "OWNER", nullable = false)
-//    public String getOwner() {
-//        return owner;
-//    }
-//
-//    public void setOwner(String owner) {
-//        this.owner = owner;
-//    }
-//}

diff --git a/src/main/java/com/casic/accessControl/feature/domain/Feature.java b/src/main/java/com/casic/accessControl/feature/domain/Feature.java
deleted file mode 100644
index c89a0c2..0000000
--- a/src/main/java/com/casic/accessControl/feature/domain/Feature.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.casic.accessControl.feature.domain;
-
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-
-import javax.persistence.*;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-//点的信息
-@Entity
-@Table(name = "feature")
-public class Feature {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private Long id;
-    @Column(name = "longitude")
-    private Double longitude;
-    @Column(name = "latitude")
-    private Double latitude;
-    @Column(name = "featureName")
-    private String featureName;
-    @Column(name = "type")
-    private int type;
-    @Column(name = "isValid")
-    private Integer isValid;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "parent")
-    private Feature parent;
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "parent")
-    private List<Feature> children;
-    @Column(name = "memo")
-    private String memo;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "owner", referencedColumnName = "id")
-    private User owner;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "company", referencedColumnName = "id")
-    private Company company;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer isValid() {
-        return isValid;
-    }
-
-    public void setValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public Feature getParent() {
-        return parent;
-    }
-
-    public void setParent(Feature parent) {
-        this.parent = parent;
-    }
-
-    public List<Feature> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<Feature> children) {
-        this.children = children;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public User getOwner() {
-        return owner;
-    }
-
-    public void setOwner(User owner) {
-        this.owner = owner;
-    }
-
-    public Company getCompany() {
-        return company;
-    }
-
-    public void setCompany(Company company) {
-        this.company = company;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java b/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
deleted file mode 100644
index 256f261..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import com.casic.accessControl.feature.domain.Feature;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/17.
- */
-public class FeatureDto {
-    private Long id;
-    private Double longitude;
-    private Double latitude;
-    private String featureName;
-    private int type;
-    private Integer isValid;
-    private String memo;
-    private Long parentId;
-
-    private String btnEdit = "<a href='#' class='btn mini blue'><i class='icon-edit'></i>编辑</a>";
-    private String btnDelete = "<a href='#' class='btn mini red'><i class='icon-trash'></i>删除</a>";
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer getIsValid() {
-        return isValid;
-    }
-
-    public void setIsValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public Long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getBtnEdit() {
-        return btnEdit;
-    }
-
-    public void setBtnEdit(String btnEdit) {
-        this.btnEdit = btnEdit;
-    }
-
-    public String getBtnDelete() {
-        return btnDelete;
-    }
-
-    public void setBtnDelete(String btnDelete) {
-        this.btnDelete = btnDelete;
-    }
-
-    public static FeatureDto convert2FeatureDto(Feature feature) {
-        if (feature == null) {
-            return null;
-        }
-        FeatureDto featureDto = new FeatureDto();
-        featureDto.setId(feature.getId());
-        featureDto.setFeatureName(feature.getFeatureName());
-        featureDto.setIsValid(feature.isValid());
-        featureDto.setLatitude(feature.getLatitude());
-        featureDto.setLongitude(feature.getLongitude());
-        featureDto.setMemo(feature.getMemo());
-        featureDto.setType(feature.getType());
-        if (feature.getParent() != null)
-            featureDto.setParentId(feature.getParent().getId());
-        return featureDto;
-    }
-
-    public static List<FeatureDto> convert2FeatureDtos(List<Feature> features) {
-        List<FeatureDto> featureDtos = new ArrayList<FeatureDto>();
-        for (Feature feature : features) {
-            featureDtos.add(convert2FeatureDto(feature));
-        }
-        return featureDtos;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java b/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
deleted file mode 100644
index 785dcba..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/19.
- */
-public class OrgDto {
-    private long id;
-
-    private String name;
-
-    private long parentId;
-
-    private List<OrgDto> children = new ArrayList<OrgDto>();
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(long parentId) {
-        this.parentId = parentId;
-    }
-
-    public List<OrgDto> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<OrgDto> children) {
-        this.children = children;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java b/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
deleted file mode 100644
index a475e21..0000000
--- a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
+++ /dev/null
@@ -1,316 +0,0 @@
-package com.casic.accessControl.feature.manager;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.core.page.Page;
-import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.marker.manager.MarkerManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.DataTableParameter;
-import com.casic.accessControl.util.DataTableUtils;
-import org.apache.commons.collections.CollectionUtils;
-import org.hibernate.Criteria;
-import org.hibernate.Query;
-import org.hibernate.criterion.Restrictions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.jdbc.object.SqlQuery;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-@Service
-public class FeatureManager extends HibernateEntityDao<Feature> {
-
-    private Logger logger = LoggerFactory.getLogger(this.getClass());
-    @Resource
-    private MarkerManager markerManager;
-
-
-    public Feature getFeatureById(Long id) {
-        Feature feature = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("id", id)).add(Restrictions.eq("isValid", 1));
-            feature = (Feature) criteria.list().get(0);
-        } catch (Exception e) {
-            return null;
-        }
-        return feature;
-    }
-
-    public FeatureDto getFeatureDtoById(Long id) {
-        return FeatureDto.convert2FeatureDto(getFeatureById(id));
-    }
-
-    /**
-     * 根据id，软删除某个点或线或片
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param ids 多个id
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public String invalidFeature(String ids) {
-        if (StringUtils.isBlank(ids) || ids.indexOf(")") != -1) {//未传入值，直接返回，防止无效查询,过滤非法请求，防止sql注入
-            return "";
-        }
-        String[] idsArr = ids.split(",");
-        StringBuilder canDeleteIds = new StringBuilder("");
-        StringBuilder cantDeleleIds = new StringBuilder("");
-        //找出能删除的和不能删除的id组合
-        for (String id : idsArr) {
-            Long longId = Long.valueOf(id);
-            if (this.isCanDelete(longId)) {
-                if (canDeleteIds.length() > 0) {
-                    canDeleteIds.append(",");
-                }
-                canDeleteIds.append(id);
-
-            } else {
-                if (cantDeleleIds.length() > 0) {
-                    cantDeleleIds.append(",");
-                }
-                cantDeleleIds.append(id);
-            }
-        }
-
-        String temp1Ids = canDeleteIds.toString();
-        String temp2Ids = cantDeleleIds.toString();
-        if (StringUtils.isNotBlank(temp2Ids)) {//有不能删除的，都不删除
-            return "";
-        }
-        Query query = this.getSession().createQuery("update Feature f set f.isValid = 0 where id in (" + temp1Ids + ")");
-        query.executeUpdate();
-
-        return "success";
-    }
-
-    /**
-     * 判断feature是否可以删除
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param id
-     * @return
-     */
-    private boolean isCanDelete(Long id) {
-        Feature feature = this.getFeatureById(id);
-        if (feature.getParent() == null) {//所有用户共用的根节点不能删除
-            return false;
-        }
-        if (CollectionUtils.isNotEmpty(feature.getChildren())) {
-            for (Feature child : feature.getChildren()) {
-                if (child.isValid() == 1) {
-                    return false;
-                }
-            }
-
-        }
-        List<Marker> markers = markerManager.getMarkerByFeature(feature);
-        if (CollectionUtils.isNotEmpty(markers)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * 将数据库中的feature信息按照参数更新
-     *
-     * @param feature
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public void saveOrupdateFeature(Feature feature, User user) {
-        this.getSession().saveOrUpdate(feature);
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param user 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByUser")
-    public List<FeatureDto> getFeaturesByUser(Integer type, User user) {
-        if (user == null) {
-            return Collections.emptyList();
-        }
-        Company company = user.getCompany();
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("type", type));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-        return FeatureDto.convert2FeatureDtos(features);
-    }
-
-    /**
-     * 分页使用，datatable获取相应type的feature某页数据
-     *
-     * @param params
-     * @param user
-     * @return
-     */
-    public DataTable<FeatureDto> getPageFeatureListByTye(String params, Feature parent, User user) {
-        DataTable<FeatureDto> result = new DataTable<FeatureDto>();
-        DataTableParameter parameter = DataTableUtils.getDataTableParameterByJsonParam(params);
-        int start = parameter.getiDisplayStart();
-        int pageSize = parameter.getiDisplayLength();
-        int pageNo = (start / pageSize) + 1;
-        Criteria criteria = this.createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        Company company = user.getCompany();
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("isValid", 1)).add(Restrictions.eq("parent", parent));
-        Page page = pagedQuery(criteria, pageNo, pageSize);
-        List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos((List<Feature>) page.getResult());
-        result.setAaData(featureDtos);
-        result.setiTotalDisplayRecords((int) page.getTotalCount());
-        result.setiTotalRecords((int) page.getTotalCount());
-        result.setsEcho(parameter.getsEcho());
-        return result;
-
-
-    }
-
-    /**
-     * 获取层次结构列表,增加缓存
-     *
-     * @param type
-     * @param company
-     * @return
-     */
-    @Cacheable(value = "getOrgList")
-    public String getOrgList(Integer type, Company company) {
-        List<OrgDto> orgDtos = new ArrayList<OrgDto>();
-        List<Feature> features = this.getRootFeatures(type);
-        for (Feature feature : features) {
-            orgDtos.add(this.getChildrenByParentId(feature.getId(), company));
-        }
-        String jsonStr = null;
-        try {
-            jsonStr = new JsonMapper().toJson(orgDtos);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return jsonStr;
-    }
-
-    //    @Cacheable(value = "getChildrenByParentId", key = "#id")
-    public OrgDto getChildrenByParentId(Long id, Company company) {
-        if (id == null) {
-            return null;
-        }
-        Feature feature = getFeatureById(id);
-        if (feature == null) {
-            return null;
-        }
-        //创建OrgDto节点
-        OrgDto orgDto = new OrgDto();
-        orgDto.setId(id); //保存ID信息
-        orgDto.setName(feature.getFeatureName());
-        if (feature.getParent() != null) {
-            orgDto.setParentId(feature.getParent().getId());
-        }
-        List<Feature> departments = this.getActiveChildrenOrgs(feature, company);
-        for (Feature fea : departments) {
-            orgDto.getChildren().add(this.getChildrenByParentId(fea.getId(), company));
-        }
-        return orgDto;
-    }
-
-    //    @Cacheable(value = "getActiveChildrenOrgs", key = "#department.getId()")
-    private List<Feature> getActiveChildrenOrgs(Feature department, Company company) {
-        List<Feature> features = new ArrayList<Feature>();
-        for (Feature feature : department.getChildren()) {
-            if (feature.isValid() == 1 && feature.getCompany().getId().equals(company.getId())) {
-                features.add(feature);
-            }
-        }
-        return features;
-    }
-
-
-    public List<Feature> getRootFeatures(Integer type) {
-        List<Feature> features = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("type", type)).add(Restrictions.isNull("parent"));
-            features = criteria.list();
-        } catch (Exception e) {
-            return Collections.emptyList();
-        }
-        return features;
-
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param company 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByCompany", key = "#company.getId()")
-    public List<Feature> getFeaturesByCompany(Company company) {
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-        criteria.add(Restrictions.eq("company", company));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-
-        for (Feature f : features) {
-            f.getChildren().toString();
-            f.getOwner().toString();
-            if (f.getParent() != null)
-                f.getParent().toString();
-        }
-        return features;
-    }
-
-    /**
-     * 根据组织结构的id获取叶子节点
-     ***重要：**已更改为包含本节点****
-     * @param type
-     * @param feature
-     * @return
-     */
-    public List<Feature> getLeafByParentId(Integer type, Feature feature) {
-        if (feature == null || feature.isValid() == 0) return Collections.emptyList();
-        List<Feature> features = new ArrayList<Feature>();
-        if (CollectionUtils.isEmpty(feature.getChildren())) {
-            features.add(feature);
-            return features;
-        }
-        List<Feature> children = feature.getChildren();
-        boolean flag = false;
-        for (Feature child : children) {
-            if (child.isValid() == 1) {
-                flag = true;
-                features.addAll(getLeafByParentId(type, child));
-            }
-        }
-//        if (!flag) {//没有有效的子节点
-            features.add(feature);
-//        }
-        return features;
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java b/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
deleted file mode 100644
index a706a36..0000000
--- a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package com.casic.accessControl.feature.web;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.Role;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.CompanyManager;
-import com.casic.accessControl.user.manager.UserManager;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.StringUtils;
-import com.casic.accessControl.xls.Common;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import sun.org.mozilla.javascript.internal.EcmaError;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.IOException;
-import java.util.*;
-
-/**
- * 提供http访问接口
- * Created by lenovo on 2016/5/16.
- */
-@Controller
-@RequestMapping(value = "feature")
-public class FeatureController {
-    @Autowired
-    private FeatureManager featureManager;
-    @Autowired
-    private UserManager userManager;
-    @Autowired
-    private CompanyManager companyManager;
-
-    @RequestMapping(value = "org-list")
-    @ResponseBody
-    public String getOrgList(@RequestParam(required = true) Integer type, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Company company = user.getCompany();
-        return featureManager.getOrgList(type, company);
-    }
-
-    @RequestMapping(value = "org-list-na")
-    @ResponseBody
-    public Map<String, String> getOrgListNa(@RequestParam Long userId) {//na端所有传过来的userid都是公司id
-        Map<String, String> res = new HashMap<String, String>();
-        res.put("message", "列表获取失败");
-        try {
-//            User user = userManager.getUserById(userId);//获取当前登录用户
-//            Company company = user.getCompany();
-            Company company = companyManager.getCompanyById(userId);
-            String areas = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.AREA.getIndex(), company);
-            String lines = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.LINE.getIndex(), company);
-            res.put("feature", areas);
-            res.put("line", lines);
-        } catch (Exception e) {
-            return res;
-        }
-        res.put("message", "成功获取");
-        return res;
-    }
-
-    @RequestMapping(value = "getFeature")
-    @ResponseBody
-    public Map<String, Object> getFeaturesByUser(@RequestParam(required = true) Integer type, HttpSession session) {
-
-        Map<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        List<FeatureDto> list = featureManager.getFeaturesByUser(type, user);
-        if (list == null) {//获取列表失败
-            result.put("message", "获取列表出现错误");
-            return result;
-        } else {
-            result.put("data", list);
-            result.put("message", "获取列表成功");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "getSubFeatureList")
-    public void getSubFeatureList(@RequestParam(required = true) String jsonParams, @RequestParam(required = false) Long parentId, HttpServletResponse response, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Feature parent = featureManager.getFeatureById(parentId);
-        DataTable<FeatureDto> dtoDataTable = featureManager.getPageFeatureListByTye(jsonParams, parent, user);
-        Gson gson = new Gson();
-        String json = gson.toJson(dtoDataTable);
-        response.setCharacterEncoding("utf-8");
-        try {
-            response.getWriter().write(json);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @RequestMapping(value = "delete")
-    @ResponseBody
-    public Map<String, Object> deleteFeatureById(@RequestParam(required = true) Long id, HttpSession session) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        try {
-            String res = featureManager.invalidFeature(id.toString());
-            if (StringUtils.isBlank(res)) {
-                result.put("message", "删除失败");
-            } else {
-                result.put("message", "删除成功");
-                result.put("success", true);
-            }
-        } catch (Exception e) {
-            result.put("message", "删除失败");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "save")
-    @ResponseBody
-    public Map<String, Object> save(@RequestParam(required = true) String params, HttpSession session) {
-        Gson gson = new Gson();
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        Map markers = gson.fromJson(params, HashMap.class);
-        String featureName = (String) markers.get("featureName");
-        String memo = (String) markers.get("memo") == null ? "" : (String) markers.get("memo");
-        Long parentId = Long.valueOf(StringUtils.isBlank((String) markers.get("parentId")) ? "-1" : (String) markers.get("parentId"));//不知为什么转过来为Double
-        Long id = Long.valueOf(StringUtils.isBlank((String) markers.get("id")) ? "-1" : (String) markers.get("id"));
-
-
-        if (StringUtils.isBlank(featureName) || parentId.equals(-1L)) {
-            result.put("message", "必要参数未传送");
-            return result;
-        }
-        Feature feature = new Feature();
-        feature.setValid(1);
-        Feature parent = featureManager.getFeatureById(parentId);
-        feature.setParent(parent);
-        feature.setFeatureName(featureName);
-        feature.setMemo(memo);
-        feature.setOwner(user);
-        feature.setCompany(user.getCompany());
-        feature.setType(parent.getType());
-        if (!id.equals(-1L)) {
-            feature.setId(id);
-        }
-        try {
-            featureManager.saveOrupdateFeature(feature, user);
-            result.put("message", "保存成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "保存失败");
-        }
-        return result;
-
-    }
-
-
-    @RequestMapping(value = "getFeatureById")
-    @ResponseBody
-    public Map<String, Object> getFeatureById(@RequestParam(required = true) Long id) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        try {
-            FeatureDto feature = featureManager.getFeatureDtoById(id);
-            result.put("data", feature);
-            result.put("message", "获取成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "获取失败");
-        }
-        return result;
-
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
index 08a290e..3f53635 100644
--- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
+++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
@@ -1,6 +1,6 @@
 package com.casic.accessControl.marker.dto;
 
-import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.domain.Feature;
 import com.casic.accessControl.marker.domain.Marker;
 import org.apache.commons.collections.CollectionUtils;
 
diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
index 080b291..7fe7434 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -4,8 +4,6 @@
 import com.casic.accessControl.core.hibernate.HibernateEntityDao;
 import com.casic.accessControl.core.page.Page;
 import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.user.domain.Company;
@@ -49,9 +47,6 @@
 public class MarkerManager extends HibernateEntityDao<Marker> {
 
     @Resource
-    private FeatureManager featureManager;
-
-    @Resource
     private UserManager userInfoManager;
 
 
@@ -154,33 +149,33 @@
 
     //获取marker
 //    @Cacheable(value = "getMarkerByFeature", key = "#feature.getId()")
-    public List<Marker> getMarkerByFeature(Feature feature) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            criteria.add(Restrictions.eq("belongLine", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            criteria.add(Restrictions.eq("belongLine", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
-    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
-            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
+//            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
     public boolean saveMarker(Marker marker) {
         try {
@@ -465,7 +460,7 @@
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setLayStyle(sheet.getCell(indexMap.get("layStyle"), i).getContents());
-                } else if(recordTypeFlag == 4) {
+                } else if (recordTypeFlag == 4) {
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setBelowType(sheet.getCell(indexMap.get("belowType"), i).getContents());
diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
index a19f2f5..7675e1f 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -2,9 +2,6 @@
 
 import com.casic.accessControl.core.ext.export.CsvExportor;
 import com.casic.accessControl.core.ext.export.TableModel;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.manager.MarkerManager;
diff --git a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java b/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
deleted file mode 100644
index e69de29..0000000
--- a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
+++ /dev/null
diff --git a/src/main/java/com/casic/accessControl/rs/FeatureResource.java b/src/main/java/com/casic/accessControl/rs/FeatureResource.java
index 68aeb97..e97f18b 100644
--- a/src/main/java/com/casic/accessControl/rs/FeatureResource.java
+++ b/src/main/java/com/casic/accessControl/rs/FeatureResource.java
@@ -1,65 +1,65 @@
-package com.casic.accessControl.rs;
-
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.UserManager;
-import com.google.gson.Gson;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import javax.annotation.Resource;
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
-* Created by admin on 2015/1/15.
-*/
-@Component
-@Path("feature")
-public class FeatureResource
-{
-    private static Logger logger = LoggerFactory.getLogger(FeatureResource.class);
-
-    @Resource
-    private UserManager userManager;
-
-    @Resource
-    private FeatureManager featureManager;
-
-    @GET
-    @Path("get")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map get(@QueryParam("userName") String userName ){
-        Map map = new HashMap<String, Object>();
-        try {
-            User user = userManager.getUserByName(userName);
-            if (user == null) {
-                map.put("success", "false");
-                map.put("message", "人员不存在！");
-                return map;
-            }
-            Company company = user.getCompany();
-            if (company!=null)
-            {
-                List<Feature> features = featureManager.getFeaturesByCompany(company);
-                List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos(features);
-                map.put("success", "true");
-                map.put("message", featureDtos);
-            }
-        }
-        catch (Exception e)
-        {
-            map.put("success", "false");
-            map.put("message", e.getMessage());
-        }
-        return  map;
-    }
-}
+//package com.casic.accessControl.rs;
+//
+//import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.dto.FeatureDto;
+//import com.casic.accessControl.feature.manager.FeatureManager;
+//import com.casic.accessControl.user.domain.Company;
+//import com.casic.accessControl.user.domain.User;
+//import com.casic.accessControl.user.manager.UserManager;
+//import com.google.gson.Gson;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.stereotype.Component;
+//import org.springframework.web.bind.annotation.RequestParam;
+//
+//import javax.annotation.Resource;
+//import javax.ws.rs.*;
+//import javax.ws.rs.core.MediaType;
+//import java.util.HashMap;
+//import java.util.List;
+//import java.util.Map;
+//
+///**
+//* Created by admin on 2015/1/15.
+//*/
+//@Component
+//@Path("feature")
+//public class FeatureResource
+//{
+//    private static Logger logger = LoggerFactory.getLogger(FeatureResource.class);
+//
+//    @Resource
+//    private UserManager userManager;
+//
+//    @Resource
+//    private FeatureManager featureManager;
+//
+//    @GET
+//    @Path("get")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public Map get(@QueryParam("userName") String userName ){
+//        Map map = new HashMap<String, Object>();
+//        try {
+//            User user = userManager.getUserByName(userName);
+//            if (user == null) {
+//                map.put("success", "false");
+//                map.put("message", "人员不存在！");
+//                return map;
+//            }
+//            Company company = user.getCompany();
+//            if (company!=null)
+//            {
+//                List<Feature> features = featureManager.getFeaturesByCompany(company);
+//                List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos(features);
+//                map.put("success", "true");
+//                map.put("message", featureDtos);
+//            }
+//        }
+//        catch (Exception e)
+//        {
+//            map.put("success", "false");
+//            map.put("message", e.getMessage());
+//        }
+//        return  map;
+//    }
+//}
diff --git a/src/main/java/com/casic/accessControl/rs/MapInfo.java b/src/main/java/com/casic/accessControl/rs/MapInfo.java
deleted file mode 100644
index a77fce9..0000000
--- a/src/main/java/com/casic/accessControl/rs/MapInfo.java
+++ /dev/null
@@ -1,131 +0,0 @@
-//package com.casic.accessControl.rs;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-///**
-// * Created by admin on 2015/8/26.
-// */
-//public class MapInfo {
-//
-//    private String mapUrl;
-//
-//    private String updateTime;
-//
-//    private String uploader;
-//
-//    private String name;
-//
-//    private String uuid;
-//
-//    private String site;
-//    /*
-//    0:草稿
-//    1：待审核
-//    2：通过
-//    3: 驳回
-//     */
-//    private String status;
-//
-//    //
-//    private int id;
-//
-//
-//    public String getMapUrl()
-//    {
-//        return mapUrl;
-//    }
-//
-//    public void setMapUrl(String mapUrl)
-//    {
-//        this.mapUrl = mapUrl;
-//    }
-//
-//    public String getUpdateTime()
-//    {
-//        return updateTime;
-//    }
-//
-//    public void setUpdateTime(String updateTime)
-//    {
-//        this.updateTime = updateTime;
-//    }
-//
-//    public String getUploader()
-//    {
-//        return uploader;
-//    }
-//
-//    public void setUploader(String uploader)
-//    {
-//        this.uploader = uploader;
-//    }
-//
-//    public String getName()
-//    {
-//        return name;
-//    }
-//
-//    public void setName(String name)
-//    {
-//        this.name = name;
-//    }
-//
-//    public String getUuid()
-//    {
-//        return uuid;
-//    }
-//
-//    public void setUuid(String uuid)
-//    {
-//        this.uuid = uuid;
-//    }
-//
-//    public String getSite()
-//    {
-//        return site;
-//    }
-//
-//    public void setSite(String site)
-//    {
-//        this.site = site;
-//    }
-//
-//    public String getStatus()
-//    {
-//        return status;
-//    }
-//
-//    public void setStatus(String status)
-//    {
-//        this.status = status;
-//    }
-//
-//    public int getId()
-//    {
-//        return id;
-//    }
-//
-//    public void setId(int id)
-//    {
-//        this.id = id;
-//    }
-//
-//    public static List<MapInfo> getMockerMaps()
-//    {
-//        List<MapInfo> maps = new ArrayList<MapInfo>();
-//        for (int i = 0; i < 20; i++)
-//        {
-//            MapInfo map = new MapInfo();
-//            map.setId(i);
-//            map.setUploader("张帆");
-//            map.setMapUrl("http://192.168.0.111:9080/accessControl/logo.jpg");
-//            map.setSite("永旺路"+i);
-//            map.setUpdateTime("2015-08-02");
-//            map.setStatus("待审核");
-//            maps.add(map);
-//        }
-//        return maps;
-//
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/rs/MarkResource.java b/src/main/java/com/casic/accessControl/rs/MarkResource.java
index 8ae4d85..cef1580 100644
--- a/src/main/java/com/casic/accessControl/rs/MarkResource.java
+++ b/src/main/java/com/casic/accessControl/rs/MarkResource.java
@@ -1,7 +1,7 @@
 package com.casic.accessControl.rs;
 
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
+//import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.manager.MarkerManager;
 import com.casic.accessControl.user.domain.Company;
@@ -35,8 +35,8 @@
     @Resource
     private MarkerManager markerManager;
 
-    @Resource
-    private FeatureManager featureManager;
+//    @Resource
+//    private FeatureManager featureManager;
 
     @GET
     @Path("post")
diff --git a/src/main/java/com/casic/accessControl/rs/UserObj.java b/src/main/java/com/casic/accessControl/rs/UserObj.java
deleted file mode 100644
index c0fe651..0000000
--- a/src/main/java/com/casic/accessControl/rs/UserObj.java
+++ /dev/null
@@ -1,61 +0,0 @@
-//package com.casic.accessControl.rs;
-//
-//import java.io.Serializable;
-//
-///**
-// * Created by admin on 2015/10/9.
-// */
-//public class UserObj implements Serializable {
-//    private String userName;
-//    private String password;
-//    private String appId;
-//    /*
-//    roles:��ɫ֮���Զ��ŷָ�
-//     */
-//    private String roles;
-//
-//    /*
-//    authorities:Ȩ��֮���Զ��ŷָ�
-//    */
-//    private String authorities;
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public String getPassword() {
-//        return password;
-//    }
-//
-//    public void setPassword(String password) {
-//        this.password = password;
-//    }
-//
-//    public String getAppId() {
-//        return appId;
-//    }
-//
-//    public void setAppId(String appId) {
-//        this.appId = appId;
-//    }
-//
-//    public String getRoles() {
-//        return roles;
-//    }
-//
-//    public void setRoles(String roles) {
-//        this.roles = roles;
-//    }
-//
-//    public String getAuthorities() {
-//        return authorities;
-//    }
-//
-//    public void setAuthorities(String authorities) {
-//        this.authorities = authorities;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java b/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java
deleted file mode 100644
index ac60ed5..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java
+++ /dev/null
@@ -1,65 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//import org.geotools.referencing.operation.transform.NADCONTransform;
-//
-//import javax.persistence.*;
-//
-///**
-// * Created by test203 on 2015/10/29.
-// */
-//@Entity
-//@Table(name = "ZX_DATABASE_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_DATABASE_INFO_ID", sequenceName = "SEQ_ZX_DATABASE_INFO_ID", allocationSize = 1, initialValue = 1)
-//public class DataBaseInfo {
-//    private Long id;
-//    private String account;
-//    private String password;
-//    private String sid;
-//    private String owner;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_ZX_DATABASE_INFO_ID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "ACCOUNT", nullable = false)
-//    public String getAccount() {
-//        return account;
-//    }
-//
-//    public void setAccount(String account) {
-//        this.account = account;
-//    }
-//
-//    @Column(name = "PASSWORD", nullable = false)
-//    public String getPassword() {
-//        return password;
-//    }
-//
-//    public void setPassword(String password) {
-//        this.password = password;
-//    }
-//
-//    @Column(name = "SID", nullable = false)
-//    public String getSid() {
-//        return sid;
-//    }
-//
-//    public void setSid(String sid) {
-//        this.sid = sid;
-//    }
-//
-//    @Column(name = "OWNER", nullable = false)
-//    public String getOwner() {
-//        return owner;
-//    }
-//
-//    public void setOwner(String owner) {
-//        this.owner = owner;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java b/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java
deleted file mode 100644
index 9578060..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java
+++ /dev/null
@@ -1,77 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//import com.casic.accessControl.org.domain.UserInfo;
-//
-//import javax.persistence.*;
-//import java.util.Date;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Entity
-//@Table(name = "ZX_ORCL_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_ORCL_INFO_ID",sequenceName = "SEQ_ZX_ORCL_INFO_ID",allocationSize = 1,initialValue = 1)
-//public class OrclInfo {
-//    private Long id;
-//    private String fileName;
-//    private String filePath;
-//    private String memo;
-//    private Date bkDay = new Date();
-//    private UserInfo userInfo;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE,generator = "SEQ_ZX_ORCL_INFO_ID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "FILE_NAME",nullable = false)
-//    public String getFileName() {
-//        return fileName;
-//    }
-//
-//    public void setFileName(String fileName) {
-//        this.fileName = fileName;
-//    }
-//
-//    @Column(name = "FILE_PATH",nullable = false)
-//    public String getFilePath() {
-//        return filePath;
-//    }
-//
-//    public void setFilePath(String filePath) {
-//        this.filePath = filePath;
-//    }
-//
-//    @Column(name = "MEMO")
-//    public String getMemo() {
-//        return memo;
-//    }
-//
-//    public void setMemo(String memo) {
-//        this.memo = memo;
-//    }
-//
-//    @Column(name = "BK_DAY")
-//    public Date getBkDay() {
-//        return bkDay;
-//    }
-//
-//    public void setBkDay(Date bkDay) {
-//        this.bkDay = bkDay;
-//    }
-//
-//    @ManyToOne(fetch = FetchType.LAZY)
-//    @JoinColumn(name = "USER_ID")
-//    public UserInfo getUserInfo() {
-//        return userInfo;
-//    }
-//
-//    public void setUserInfo(UserInfo userInfo) {
-//        this.userInfo = userInfo;
-//    }
-//}

diff --git a/src/main/java/com/casic/accessControl/feature/domain/Feature.java b/src/main/java/com/casic/accessControl/feature/domain/Feature.java
deleted file mode 100644
index c89a0c2..0000000
--- a/src/main/java/com/casic/accessControl/feature/domain/Feature.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.casic.accessControl.feature.domain;
-
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-
-import javax.persistence.*;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-//点的信息
-@Entity
-@Table(name = "feature")
-public class Feature {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private Long id;
-    @Column(name = "longitude")
-    private Double longitude;
-    @Column(name = "latitude")
-    private Double latitude;
-    @Column(name = "featureName")
-    private String featureName;
-    @Column(name = "type")
-    private int type;
-    @Column(name = "isValid")
-    private Integer isValid;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "parent")
-    private Feature parent;
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "parent")
-    private List<Feature> children;
-    @Column(name = "memo")
-    private String memo;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "owner", referencedColumnName = "id")
-    private User owner;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "company", referencedColumnName = "id")
-    private Company company;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer isValid() {
-        return isValid;
-    }
-
-    public void setValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public Feature getParent() {
-        return parent;
-    }
-
-    public void setParent(Feature parent) {
-        this.parent = parent;
-    }
-
-    public List<Feature> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<Feature> children) {
-        this.children = children;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public User getOwner() {
-        return owner;
-    }
-
-    public void setOwner(User owner) {
-        this.owner = owner;
-    }
-
-    public Company getCompany() {
-        return company;
-    }
-
-    public void setCompany(Company company) {
-        this.company = company;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java b/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
deleted file mode 100644
index 256f261..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import com.casic.accessControl.feature.domain.Feature;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/17.
- */
-public class FeatureDto {
-    private Long id;
-    private Double longitude;
-    private Double latitude;
-    private String featureName;
-    private int type;
-    private Integer isValid;
-    private String memo;
-    private Long parentId;
-
-    private String btnEdit = "<a href='#' class='btn mini blue'><i class='icon-edit'></i>编辑</a>";
-    private String btnDelete = "<a href='#' class='btn mini red'><i class='icon-trash'></i>删除</a>";
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer getIsValid() {
-        return isValid;
-    }
-
-    public void setIsValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public Long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getBtnEdit() {
-        return btnEdit;
-    }
-
-    public void setBtnEdit(String btnEdit) {
-        this.btnEdit = btnEdit;
-    }
-
-    public String getBtnDelete() {
-        return btnDelete;
-    }
-
-    public void setBtnDelete(String btnDelete) {
-        this.btnDelete = btnDelete;
-    }
-
-    public static FeatureDto convert2FeatureDto(Feature feature) {
-        if (feature == null) {
-            return null;
-        }
-        FeatureDto featureDto = new FeatureDto();
-        featureDto.setId(feature.getId());
-        featureDto.setFeatureName(feature.getFeatureName());
-        featureDto.setIsValid(feature.isValid());
-        featureDto.setLatitude(feature.getLatitude());
-        featureDto.setLongitude(feature.getLongitude());
-        featureDto.setMemo(feature.getMemo());
-        featureDto.setType(feature.getType());
-        if (feature.getParent() != null)
-            featureDto.setParentId(feature.getParent().getId());
-        return featureDto;
-    }
-
-    public static List<FeatureDto> convert2FeatureDtos(List<Feature> features) {
-        List<FeatureDto> featureDtos = new ArrayList<FeatureDto>();
-        for (Feature feature : features) {
-            featureDtos.add(convert2FeatureDto(feature));
-        }
-        return featureDtos;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java b/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
deleted file mode 100644
index 785dcba..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/19.
- */
-public class OrgDto {
-    private long id;
-
-    private String name;
-
-    private long parentId;
-
-    private List<OrgDto> children = new ArrayList<OrgDto>();
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(long parentId) {
-        this.parentId = parentId;
-    }
-
-    public List<OrgDto> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<OrgDto> children) {
-        this.children = children;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java b/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
deleted file mode 100644
index a475e21..0000000
--- a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
+++ /dev/null
@@ -1,316 +0,0 @@
-package com.casic.accessControl.feature.manager;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.core.page.Page;
-import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.marker.manager.MarkerManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.DataTableParameter;
-import com.casic.accessControl.util.DataTableUtils;
-import org.apache.commons.collections.CollectionUtils;
-import org.hibernate.Criteria;
-import org.hibernate.Query;
-import org.hibernate.criterion.Restrictions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.jdbc.object.SqlQuery;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-@Service
-public class FeatureManager extends HibernateEntityDao<Feature> {
-
-    private Logger logger = LoggerFactory.getLogger(this.getClass());
-    @Resource
-    private MarkerManager markerManager;
-
-
-    public Feature getFeatureById(Long id) {
-        Feature feature = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("id", id)).add(Restrictions.eq("isValid", 1));
-            feature = (Feature) criteria.list().get(0);
-        } catch (Exception e) {
-            return null;
-        }
-        return feature;
-    }
-
-    public FeatureDto getFeatureDtoById(Long id) {
-        return FeatureDto.convert2FeatureDto(getFeatureById(id));
-    }
-
-    /**
-     * 根据id，软删除某个点或线或片
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param ids 多个id
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public String invalidFeature(String ids) {
-        if (StringUtils.isBlank(ids) || ids.indexOf(")") != -1) {//未传入值，直接返回，防止无效查询,过滤非法请求，防止sql注入
-            return "";
-        }
-        String[] idsArr = ids.split(",");
-        StringBuilder canDeleteIds = new StringBuilder("");
-        StringBuilder cantDeleleIds = new StringBuilder("");
-        //找出能删除的和不能删除的id组合
-        for (String id : idsArr) {
-            Long longId = Long.valueOf(id);
-            if (this.isCanDelete(longId)) {
-                if (canDeleteIds.length() > 0) {
-                    canDeleteIds.append(",");
-                }
-                canDeleteIds.append(id);
-
-            } else {
-                if (cantDeleleIds.length() > 0) {
-                    cantDeleleIds.append(",");
-                }
-                cantDeleleIds.append(id);
-            }
-        }
-
-        String temp1Ids = canDeleteIds.toString();
-        String temp2Ids = cantDeleleIds.toString();
-        if (StringUtils.isNotBlank(temp2Ids)) {//有不能删除的，都不删除
-            return "";
-        }
-        Query query = this.getSession().createQuery("update Feature f set f.isValid = 0 where id in (" + temp1Ids + ")");
-        query.executeUpdate();
-
-        return "success";
-    }
-
-    /**
-     * 判断feature是否可以删除
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param id
-     * @return
-     */
-    private boolean isCanDelete(Long id) {
-        Feature feature = this.getFeatureById(id);
-        if (feature.getParent() == null) {//所有用户共用的根节点不能删除
-            return false;
-        }
-        if (CollectionUtils.isNotEmpty(feature.getChildren())) {
-            for (Feature child : feature.getChildren()) {
-                if (child.isValid() == 1) {
-                    return false;
-                }
-            }
-
-        }
-        List<Marker> markers = markerManager.getMarkerByFeature(feature);
-        if (CollectionUtils.isNotEmpty(markers)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * 将数据库中的feature信息按照参数更新
-     *
-     * @param feature
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public void saveOrupdateFeature(Feature feature, User user) {
-        this.getSession().saveOrUpdate(feature);
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param user 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByUser")
-    public List<FeatureDto> getFeaturesByUser(Integer type, User user) {
-        if (user == null) {
-            return Collections.emptyList();
-        }
-        Company company = user.getCompany();
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("type", type));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-        return FeatureDto.convert2FeatureDtos(features);
-    }
-
-    /**
-     * 分页使用，datatable获取相应type的feature某页数据
-     *
-     * @param params
-     * @param user
-     * @return
-     */
-    public DataTable<FeatureDto> getPageFeatureListByTye(String params, Feature parent, User user) {
-        DataTable<FeatureDto> result = new DataTable<FeatureDto>();
-        DataTableParameter parameter = DataTableUtils.getDataTableParameterByJsonParam(params);
-        int start = parameter.getiDisplayStart();
-        int pageSize = parameter.getiDisplayLength();
-        int pageNo = (start / pageSize) + 1;
-        Criteria criteria = this.createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        Company company = user.getCompany();
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("isValid", 1)).add(Restrictions.eq("parent", parent));
-        Page page = pagedQuery(criteria, pageNo, pageSize);
-        List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos((List<Feature>) page.getResult());
-        result.setAaData(featureDtos);
-        result.setiTotalDisplayRecords((int) page.getTotalCount());
-        result.setiTotalRecords((int) page.getTotalCount());
-        result.setsEcho(parameter.getsEcho());
-        return result;
-
-
-    }
-
-    /**
-     * 获取层次结构列表,增加缓存
-     *
-     * @param type
-     * @param company
-     * @return
-     */
-    @Cacheable(value = "getOrgList")
-    public String getOrgList(Integer type, Company company) {
-        List<OrgDto> orgDtos = new ArrayList<OrgDto>();
-        List<Feature> features = this.getRootFeatures(type);
-        for (Feature feature : features) {
-            orgDtos.add(this.getChildrenByParentId(feature.getId(), company));
-        }
-        String jsonStr = null;
-        try {
-            jsonStr = new JsonMapper().toJson(orgDtos);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return jsonStr;
-    }
-
-    //    @Cacheable(value = "getChildrenByParentId", key = "#id")
-    public OrgDto getChildrenByParentId(Long id, Company company) {
-        if (id == null) {
-            return null;
-        }
-        Feature feature = getFeatureById(id);
-        if (feature == null) {
-            return null;
-        }
-        //创建OrgDto节点
-        OrgDto orgDto = new OrgDto();
-        orgDto.setId(id); //保存ID信息
-        orgDto.setName(feature.getFeatureName());
-        if (feature.getParent() != null) {
-            orgDto.setParentId(feature.getParent().getId());
-        }
-        List<Feature> departments = this.getActiveChildrenOrgs(feature, company);
-        for (Feature fea : departments) {
-            orgDto.getChildren().add(this.getChildrenByParentId(fea.getId(), company));
-        }
-        return orgDto;
-    }
-
-    //    @Cacheable(value = "getActiveChildrenOrgs", key = "#department.getId()")
-    private List<Feature> getActiveChildrenOrgs(Feature department, Company company) {
-        List<Feature> features = new ArrayList<Feature>();
-        for (Feature feature : department.getChildren()) {
-            if (feature.isValid() == 1 && feature.getCompany().getId().equals(company.getId())) {
-                features.add(feature);
-            }
-        }
-        return features;
-    }
-
-
-    public List<Feature> getRootFeatures(Integer type) {
-        List<Feature> features = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("type", type)).add(Restrictions.isNull("parent"));
-            features = criteria.list();
-        } catch (Exception e) {
-            return Collections.emptyList();
-        }
-        return features;
-
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param company 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByCompany", key = "#company.getId()")
-    public List<Feature> getFeaturesByCompany(Company company) {
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-        criteria.add(Restrictions.eq("company", company));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-
-        for (Feature f : features) {
-            f.getChildren().toString();
-            f.getOwner().toString();
-            if (f.getParent() != null)
-                f.getParent().toString();
-        }
-        return features;
-    }
-
-    /**
-     * 根据组织结构的id获取叶子节点
-     ***重要：**已更改为包含本节点****
-     * @param type
-     * @param feature
-     * @return
-     */
-    public List<Feature> getLeafByParentId(Integer type, Feature feature) {
-        if (feature == null || feature.isValid() == 0) return Collections.emptyList();
-        List<Feature> features = new ArrayList<Feature>();
-        if (CollectionUtils.isEmpty(feature.getChildren())) {
-            features.add(feature);
-            return features;
-        }
-        List<Feature> children = feature.getChildren();
-        boolean flag = false;
-        for (Feature child : children) {
-            if (child.isValid() == 1) {
-                flag = true;
-                features.addAll(getLeafByParentId(type, child));
-            }
-        }
-//        if (!flag) {//没有有效的子节点
-            features.add(feature);
-//        }
-        return features;
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java b/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
deleted file mode 100644
index a706a36..0000000
--- a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package com.casic.accessControl.feature.web;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.Role;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.CompanyManager;
-import com.casic.accessControl.user.manager.UserManager;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.StringUtils;
-import com.casic.accessControl.xls.Common;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import sun.org.mozilla.javascript.internal.EcmaError;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.IOException;
-import java.util.*;
-
-/**
- * 提供http访问接口
- * Created by lenovo on 2016/5/16.
- */
-@Controller
-@RequestMapping(value = "feature")
-public class FeatureController {
-    @Autowired
-    private FeatureManager featureManager;
-    @Autowired
-    private UserManager userManager;
-    @Autowired
-    private CompanyManager companyManager;
-
-    @RequestMapping(value = "org-list")
-    @ResponseBody
-    public String getOrgList(@RequestParam(required = true) Integer type, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Company company = user.getCompany();
-        return featureManager.getOrgList(type, company);
-    }
-
-    @RequestMapping(value = "org-list-na")
-    @ResponseBody
-    public Map<String, String> getOrgListNa(@RequestParam Long userId) {//na端所有传过来的userid都是公司id
-        Map<String, String> res = new HashMap<String, String>();
-        res.put("message", "列表获取失败");
-        try {
-//            User user = userManager.getUserById(userId);//获取当前登录用户
-//            Company company = user.getCompany();
-            Company company = companyManager.getCompanyById(userId);
-            String areas = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.AREA.getIndex(), company);
-            String lines = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.LINE.getIndex(), company);
-            res.put("feature", areas);
-            res.put("line", lines);
-        } catch (Exception e) {
-            return res;
-        }
-        res.put("message", "成功获取");
-        return res;
-    }
-
-    @RequestMapping(value = "getFeature")
-    @ResponseBody
-    public Map<String, Object> getFeaturesByUser(@RequestParam(required = true) Integer type, HttpSession session) {
-
-        Map<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        List<FeatureDto> list = featureManager.getFeaturesByUser(type, user);
-        if (list == null) {//获取列表失败
-            result.put("message", "获取列表出现错误");
-            return result;
-        } else {
-            result.put("data", list);
-            result.put("message", "获取列表成功");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "getSubFeatureList")
-    public void getSubFeatureList(@RequestParam(required = true) String jsonParams, @RequestParam(required = false) Long parentId, HttpServletResponse response, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Feature parent = featureManager.getFeatureById(parentId);
-        DataTable<FeatureDto> dtoDataTable = featureManager.getPageFeatureListByTye(jsonParams, parent, user);
-        Gson gson = new Gson();
-        String json = gson.toJson(dtoDataTable);
-        response.setCharacterEncoding("utf-8");
-        try {
-            response.getWriter().write(json);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @RequestMapping(value = "delete")
-    @ResponseBody
-    public Map<String, Object> deleteFeatureById(@RequestParam(required = true) Long id, HttpSession session) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        try {
-            String res = featureManager.invalidFeature(id.toString());
-            if (StringUtils.isBlank(res)) {
-                result.put("message", "删除失败");
-            } else {
-                result.put("message", "删除成功");
-                result.put("success", true);
-            }
-        } catch (Exception e) {
-            result.put("message", "删除失败");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "save")
-    @ResponseBody
-    public Map<String, Object> save(@RequestParam(required = true) String params, HttpSession session) {
-        Gson gson = new Gson();
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        Map markers = gson.fromJson(params, HashMap.class);
-        String featureName = (String) markers.get("featureName");
-        String memo = (String) markers.get("memo") == null ? "" : (String) markers.get("memo");
-        Long parentId = Long.valueOf(StringUtils.isBlank((String) markers.get("parentId")) ? "-1" : (String) markers.get("parentId"));//不知为什么转过来为Double
-        Long id = Long.valueOf(StringUtils.isBlank((String) markers.get("id")) ? "-1" : (String) markers.get("id"));
-
-
-        if (StringUtils.isBlank(featureName) || parentId.equals(-1L)) {
-            result.put("message", "必要参数未传送");
-            return result;
-        }
-        Feature feature = new Feature();
-        feature.setValid(1);
-        Feature parent = featureManager.getFeatureById(parentId);
-        feature.setParent(parent);
-        feature.setFeatureName(featureName);
-        feature.setMemo(memo);
-        feature.setOwner(user);
-        feature.setCompany(user.getCompany());
-        feature.setType(parent.getType());
-        if (!id.equals(-1L)) {
-            feature.setId(id);
-        }
-        try {
-            featureManager.saveOrupdateFeature(feature, user);
-            result.put("message", "保存成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "保存失败");
-        }
-        return result;
-
-    }
-
-
-    @RequestMapping(value = "getFeatureById")
-    @ResponseBody
-    public Map<String, Object> getFeatureById(@RequestParam(required = true) Long id) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        try {
-            FeatureDto feature = featureManager.getFeatureDtoById(id);
-            result.put("data", feature);
-            result.put("message", "获取成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "获取失败");
-        }
-        return result;
-
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
index 08a290e..3f53635 100644
--- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
+++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
@@ -1,6 +1,6 @@
 package com.casic.accessControl.marker.dto;
 
-import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.domain.Feature;
 import com.casic.accessControl.marker.domain.Marker;
 import org.apache.commons.collections.CollectionUtils;
 
diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
index 080b291..7fe7434 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -4,8 +4,6 @@
 import com.casic.accessControl.core.hibernate.HibernateEntityDao;
 import com.casic.accessControl.core.page.Page;
 import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.user.domain.Company;
@@ -49,9 +47,6 @@
 public class MarkerManager extends HibernateEntityDao<Marker> {
 
     @Resource
-    private FeatureManager featureManager;
-
-    @Resource
     private UserManager userInfoManager;
 
 
@@ -154,33 +149,33 @@
 
     //获取marker
 //    @Cacheable(value = "getMarkerByFeature", key = "#feature.getId()")
-    public List<Marker> getMarkerByFeature(Feature feature) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            criteria.add(Restrictions.eq("belongLine", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            criteria.add(Restrictions.eq("belongLine", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
-    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
-            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
+//            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
     public boolean saveMarker(Marker marker) {
         try {
@@ -465,7 +460,7 @@
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setLayStyle(sheet.getCell(indexMap.get("layStyle"), i).getContents());
-                } else if(recordTypeFlag == 4) {
+                } else if (recordTypeFlag == 4) {
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setBelowType(sheet.getCell(indexMap.get("belowType"), i).getContents());
diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
index a19f2f5..7675e1f 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -2,9 +2,6 @@
 
 import com.casic.accessControl.core.ext.export.CsvExportor;
 import com.casic.accessControl.core.ext.export.TableModel;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.manager.MarkerManager;
diff --git a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java b/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
deleted file mode 100644
index e69de29..0000000
--- a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
+++ /dev/null
diff --git a/src/main/java/com/casic/accessControl/rs/FeatureResource.java b/src/main/java/com/casic/accessControl/rs/FeatureResource.java
index 68aeb97..e97f18b 100644
--- a/src/main/java/com/casic/accessControl/rs/FeatureResource.java
+++ b/src/main/java/com/casic/accessControl/rs/FeatureResource.java
@@ -1,65 +1,65 @@
-package com.casic.accessControl.rs;
-
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.UserManager;
-import com.google.gson.Gson;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import javax.annotation.Resource;
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
-* Created by admin on 2015/1/15.
-*/
-@Component
-@Path("feature")
-public class FeatureResource
-{
-    private static Logger logger = LoggerFactory.getLogger(FeatureResource.class);
-
-    @Resource
-    private UserManager userManager;
-
-    @Resource
-    private FeatureManager featureManager;
-
-    @GET
-    @Path("get")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map get(@QueryParam("userName") String userName ){
-        Map map = new HashMap<String, Object>();
-        try {
-            User user = userManager.getUserByName(userName);
-            if (user == null) {
-                map.put("success", "false");
-                map.put("message", "人员不存在！");
-                return map;
-            }
-            Company company = user.getCompany();
-            if (company!=null)
-            {
-                List<Feature> features = featureManager.getFeaturesByCompany(company);
-                List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos(features);
-                map.put("success", "true");
-                map.put("message", featureDtos);
-            }
-        }
-        catch (Exception e)
-        {
-            map.put("success", "false");
-            map.put("message", e.getMessage());
-        }
-        return  map;
-    }
-}
+//package com.casic.accessControl.rs;
+//
+//import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.dto.FeatureDto;
+//import com.casic.accessControl.feature.manager.FeatureManager;
+//import com.casic.accessControl.user.domain.Company;
+//import com.casic.accessControl.user.domain.User;
+//import com.casic.accessControl.user.manager.UserManager;
+//import com.google.gson.Gson;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.stereotype.Component;
+//import org.springframework.web.bind.annotation.RequestParam;
+//
+//import javax.annotation.Resource;
+//import javax.ws.rs.*;
+//import javax.ws.rs.core.MediaType;
+//import java.util.HashMap;
+//import java.util.List;
+//import java.util.Map;
+//
+///**
+//* Created by admin on 2015/1/15.
+//*/
+//@Component
+//@Path("feature")
+//public class FeatureResource
+//{
+//    private static Logger logger = LoggerFactory.getLogger(FeatureResource.class);
+//
+//    @Resource
+//    private UserManager userManager;
+//
+//    @Resource
+//    private FeatureManager featureManager;
+//
+//    @GET
+//    @Path("get")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public Map get(@QueryParam("userName") String userName ){
+//        Map map = new HashMap<String, Object>();
+//        try {
+//            User user = userManager.getUserByName(userName);
+//            if (user == null) {
+//                map.put("success", "false");
+//                map.put("message", "人员不存在！");
+//                return map;
+//            }
+//            Company company = user.getCompany();
+//            if (company!=null)
+//            {
+//                List<Feature> features = featureManager.getFeaturesByCompany(company);
+//                List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos(features);
+//                map.put("success", "true");
+//                map.put("message", featureDtos);
+//            }
+//        }
+//        catch (Exception e)
+//        {
+//            map.put("success", "false");
+//            map.put("message", e.getMessage());
+//        }
+//        return  map;
+//    }
+//}
diff --git a/src/main/java/com/casic/accessControl/rs/MapInfo.java b/src/main/java/com/casic/accessControl/rs/MapInfo.java
deleted file mode 100644
index a77fce9..0000000
--- a/src/main/java/com/casic/accessControl/rs/MapInfo.java
+++ /dev/null
@@ -1,131 +0,0 @@
-//package com.casic.accessControl.rs;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-///**
-// * Created by admin on 2015/8/26.
-// */
-//public class MapInfo {
-//
-//    private String mapUrl;
-//
-//    private String updateTime;
-//
-//    private String uploader;
-//
-//    private String name;
-//
-//    private String uuid;
-//
-//    private String site;
-//    /*
-//    0:草稿
-//    1：待审核
-//    2：通过
-//    3: 驳回
-//     */
-//    private String status;
-//
-//    //
-//    private int id;
-//
-//
-//    public String getMapUrl()
-//    {
-//        return mapUrl;
-//    }
-//
-//    public void setMapUrl(String mapUrl)
-//    {
-//        this.mapUrl = mapUrl;
-//    }
-//
-//    public String getUpdateTime()
-//    {
-//        return updateTime;
-//    }
-//
-//    public void setUpdateTime(String updateTime)
-//    {
-//        this.updateTime = updateTime;
-//    }
-//
-//    public String getUploader()
-//    {
-//        return uploader;
-//    }
-//
-//    public void setUploader(String uploader)
-//    {
-//        this.uploader = uploader;
-//    }
-//
-//    public String getName()
-//    {
-//        return name;
-//    }
-//
-//    public void setName(String name)
-//    {
-//        this.name = name;
-//    }
-//
-//    public String getUuid()
-//    {
-//        return uuid;
-//    }
-//
-//    public void setUuid(String uuid)
-//    {
-//        this.uuid = uuid;
-//    }
-//
-//    public String getSite()
-//    {
-//        return site;
-//    }
-//
-//    public void setSite(String site)
-//    {
-//        this.site = site;
-//    }
-//
-//    public String getStatus()
-//    {
-//        return status;
-//    }
-//
-//    public void setStatus(String status)
-//    {
-//        this.status = status;
-//    }
-//
-//    public int getId()
-//    {
-//        return id;
-//    }
-//
-//    public void setId(int id)
-//    {
-//        this.id = id;
-//    }
-//
-//    public static List<MapInfo> getMockerMaps()
-//    {
-//        List<MapInfo> maps = new ArrayList<MapInfo>();
-//        for (int i = 0; i < 20; i++)
-//        {
-//            MapInfo map = new MapInfo();
-//            map.setId(i);
-//            map.setUploader("张帆");
-//            map.setMapUrl("http://192.168.0.111:9080/accessControl/logo.jpg");
-//            map.setSite("永旺路"+i);
-//            map.setUpdateTime("2015-08-02");
-//            map.setStatus("待审核");
-//            maps.add(map);
-//        }
-//        return maps;
-//
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/rs/MarkResource.java b/src/main/java/com/casic/accessControl/rs/MarkResource.java
index 8ae4d85..cef1580 100644
--- a/src/main/java/com/casic/accessControl/rs/MarkResource.java
+++ b/src/main/java/com/casic/accessControl/rs/MarkResource.java
@@ -1,7 +1,7 @@
 package com.casic.accessControl.rs;
 
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
+//import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.manager.MarkerManager;
 import com.casic.accessControl.user.domain.Company;
@@ -35,8 +35,8 @@
     @Resource
     private MarkerManager markerManager;
 
-    @Resource
-    private FeatureManager featureManager;
+//    @Resource
+//    private FeatureManager featureManager;
 
     @GET
     @Path("post")
diff --git a/src/main/java/com/casic/accessControl/rs/UserObj.java b/src/main/java/com/casic/accessControl/rs/UserObj.java
deleted file mode 100644
index c0fe651..0000000
--- a/src/main/java/com/casic/accessControl/rs/UserObj.java
+++ /dev/null
@@ -1,61 +0,0 @@
-//package com.casic.accessControl.rs;
-//
-//import java.io.Serializable;
-//
-///**
-// * Created by admin on 2015/10/9.
-// */
-//public class UserObj implements Serializable {
-//    private String userName;
-//    private String password;
-//    private String appId;
-//    /*
-//    roles:��ɫ֮���Զ��ŷָ�
-//     */
-//    private String roles;
-//
-//    /*
-//    authorities:Ȩ��֮���Զ��ŷָ�
-//    */
-//    private String authorities;
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public String getPassword() {
-//        return password;
-//    }
-//
-//    public void setPassword(String password) {
-//        this.password = password;
-//    }
-//
-//    public String getAppId() {
-//        return appId;
-//    }
-//
-//    public void setAppId(String appId) {
-//        this.appId = appId;
-//    }
-//
-//    public String getRoles() {
-//        return roles;
-//    }
-//
-//    public void setRoles(String roles) {
-//        this.roles = roles;
-//    }
-//
-//    public String getAuthorities() {
-//        return authorities;
-//    }
-//
-//    public void setAuthorities(String authorities) {
-//        this.authorities = authorities;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java b/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java
deleted file mode 100644
index ac60ed5..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java
+++ /dev/null
@@ -1,65 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//import org.geotools.referencing.operation.transform.NADCONTransform;
-//
-//import javax.persistence.*;
-//
-///**
-// * Created by test203 on 2015/10/29.
-// */
-//@Entity
-//@Table(name = "ZX_DATABASE_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_DATABASE_INFO_ID", sequenceName = "SEQ_ZX_DATABASE_INFO_ID", allocationSize = 1, initialValue = 1)
-//public class DataBaseInfo {
-//    private Long id;
-//    private String account;
-//    private String password;
-//    private String sid;
-//    private String owner;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_ZX_DATABASE_INFO_ID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "ACCOUNT", nullable = false)
-//    public String getAccount() {
-//        return account;
-//    }
-//
-//    public void setAccount(String account) {
-//        this.account = account;
-//    }
-//
-//    @Column(name = "PASSWORD", nullable = false)
-//    public String getPassword() {
-//        return password;
-//    }
-//
-//    public void setPassword(String password) {
-//        this.password = password;
-//    }
-//
-//    @Column(name = "SID", nullable = false)
-//    public String getSid() {
-//        return sid;
-//    }
-//
-//    public void setSid(String sid) {
-//        this.sid = sid;
-//    }
-//
-//    @Column(name = "OWNER", nullable = false)
-//    public String getOwner() {
-//        return owner;
-//    }
-//
-//    public void setOwner(String owner) {
-//        this.owner = owner;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java b/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java
deleted file mode 100644
index 9578060..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java
+++ /dev/null
@@ -1,77 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//import com.casic.accessControl.org.domain.UserInfo;
-//
-//import javax.persistence.*;
-//import java.util.Date;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Entity
-//@Table(name = "ZX_ORCL_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_ORCL_INFO_ID",sequenceName = "SEQ_ZX_ORCL_INFO_ID",allocationSize = 1,initialValue = 1)
-//public class OrclInfo {
-//    private Long id;
-//    private String fileName;
-//    private String filePath;
-//    private String memo;
-//    private Date bkDay = new Date();
-//    private UserInfo userInfo;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE,generator = "SEQ_ZX_ORCL_INFO_ID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "FILE_NAME",nullable = false)
-//    public String getFileName() {
-//        return fileName;
-//    }
-//
-//    public void setFileName(String fileName) {
-//        this.fileName = fileName;
-//    }
-//
-//    @Column(name = "FILE_PATH",nullable = false)
-//    public String getFilePath() {
-//        return filePath;
-//    }
-//
-//    public void setFilePath(String filePath) {
-//        this.filePath = filePath;
-//    }
-//
-//    @Column(name = "MEMO")
-//    public String getMemo() {
-//        return memo;
-//    }
-//
-//    public void setMemo(String memo) {
-//        this.memo = memo;
-//    }
-//
-//    @Column(name = "BK_DAY")
-//    public Date getBkDay() {
-//        return bkDay;
-//    }
-//
-//    public void setBkDay(Date bkDay) {
-//        this.bkDay = bkDay;
-//    }
-//
-//    @ManyToOne(fetch = FetchType.LAZY)
-//    @JoinColumn(name = "USER_ID")
-//    public UserInfo getUserInfo() {
-//        return userInfo;
-//    }
-//
-//    public void setUserInfo(UserInfo userInfo) {
-//        this.userInfo = userInfo;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/SysLogInfo.java b/src/main/java/com/casic/accessControl/sys/domain/SysLogInfo.java
deleted file mode 100644
index 60e5583..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/SysLogInfo.java
+++ /dev/null
@@ -1,70 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//
-//import com.casic.accessControl.user.domain.UserInfo;
-//
-//import javax.persistence.*;
-//import java.io.Serializable;
-//import java.util.Date;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Entity
-//@Table(name = "ZX_SYS_LOG_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_SYS_LOG_ID",sequenceName = "SEQ_ZX_SYS_LOG_ID",allocationSize = 1,initialValue = 1)
-//public class SysLogInfo implements Serializable{
-//    private Long id;
-//    private String logType;//系统日志、运行日志、操作日志
-//    private String msg;
-//    private Date logDay = new Date();
-//    private UserInfo user;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE,generator = "SEQ_ZX_SYS_LOG_ID")
-//    @Column(name = "DBID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "LOG_TYPE",nullable = false)
-//    public String getLogType() {
-//        return logType;
-//    }
-//
-//    public void setLogType(String logType) {
-//        this.logType = logType;
-//    }
-//
-//    @Column(name = "LOG_MSG",nullable = false)
-//    public String getMsg() {
-//        return msg;
-//    }
-//
-//    public void setMsg(String msg) {
-//        this.msg = msg;
-//    }
-//
-//    @Column(name = "LOG_DAY")
-//    public Date getLogDay() {
-//        return logDay;
-//    }
-//
-//    public void setLogDay(Date logDay) {
-//        this.logDay = logDay;
-//    }
-//
-//    @ManyToOne(fetch = FetchType.LAZY)
-//    @JoinColumn(name = "USER_ID")
-//    public UserInfo getUser() {
-//        return user;
-//    }
-//
-//    public void setUser(UserInfo user) {
-//        this.user = user;
-//    }
-//}

diff --git a/src/main/java/com/casic/accessControl/feature/domain/Feature.java b/src/main/java/com/casic/accessControl/feature/domain/Feature.java
deleted file mode 100644
index c89a0c2..0000000
--- a/src/main/java/com/casic/accessControl/feature/domain/Feature.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.casic.accessControl.feature.domain;
-
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-
-import javax.persistence.*;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-//点的信息
-@Entity
-@Table(name = "feature")
-public class Feature {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private Long id;
-    @Column(name = "longitude")
-    private Double longitude;
-    @Column(name = "latitude")
-    private Double latitude;
-    @Column(name = "featureName")
-    private String featureName;
-    @Column(name = "type")
-    private int type;
-    @Column(name = "isValid")
-    private Integer isValid;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "parent")
-    private Feature parent;
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "parent")
-    private List<Feature> children;
-    @Column(name = "memo")
-    private String memo;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "owner", referencedColumnName = "id")
-    private User owner;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "company", referencedColumnName = "id")
-    private Company company;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer isValid() {
-        return isValid;
-    }
-
-    public void setValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public Feature getParent() {
-        return parent;
-    }
-
-    public void setParent(Feature parent) {
-        this.parent = parent;
-    }
-
-    public List<Feature> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<Feature> children) {
-        this.children = children;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public User getOwner() {
-        return owner;
-    }
-
-    public void setOwner(User owner) {
-        this.owner = owner;
-    }
-
-    public Company getCompany() {
-        return company;
-    }
-
-    public void setCompany(Company company) {
-        this.company = company;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java b/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
deleted file mode 100644
index 256f261..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import com.casic.accessControl.feature.domain.Feature;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/17.
- */
-public class FeatureDto {
-    private Long id;
-    private Double longitude;
-    private Double latitude;
-    private String featureName;
-    private int type;
-    private Integer isValid;
-    private String memo;
-    private Long parentId;
-
-    private String btnEdit = "<a href='#' class='btn mini blue'><i class='icon-edit'></i>编辑</a>";
-    private String btnDelete = "<a href='#' class='btn mini red'><i class='icon-trash'></i>删除</a>";
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer getIsValid() {
-        return isValid;
-    }
-
-    public void setIsValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public Long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getBtnEdit() {
-        return btnEdit;
-    }
-
-    public void setBtnEdit(String btnEdit) {
-        this.btnEdit = btnEdit;
-    }
-
-    public String getBtnDelete() {
-        return btnDelete;
-    }
-
-    public void setBtnDelete(String btnDelete) {
-        this.btnDelete = btnDelete;
-    }
-
-    public static FeatureDto convert2FeatureDto(Feature feature) {
-        if (feature == null) {
-            return null;
-        }
-        FeatureDto featureDto = new FeatureDto();
-        featureDto.setId(feature.getId());
-        featureDto.setFeatureName(feature.getFeatureName());
-        featureDto.setIsValid(feature.isValid());
-        featureDto.setLatitude(feature.getLatitude());
-        featureDto.setLongitude(feature.getLongitude());
-        featureDto.setMemo(feature.getMemo());
-        featureDto.setType(feature.getType());
-        if (feature.getParent() != null)
-            featureDto.setParentId(feature.getParent().getId());
-        return featureDto;
-    }
-
-    public static List<FeatureDto> convert2FeatureDtos(List<Feature> features) {
-        List<FeatureDto> featureDtos = new ArrayList<FeatureDto>();
-        for (Feature feature : features) {
-            featureDtos.add(convert2FeatureDto(feature));
-        }
-        return featureDtos;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java b/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
deleted file mode 100644
index 785dcba..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/19.
- */
-public class OrgDto {
-    private long id;
-
-    private String name;
-
-    private long parentId;
-
-    private List<OrgDto> children = new ArrayList<OrgDto>();
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(long parentId) {
-        this.parentId = parentId;
-    }
-
-    public List<OrgDto> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<OrgDto> children) {
-        this.children = children;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java b/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
deleted file mode 100644
index a475e21..0000000
--- a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
+++ /dev/null
@@ -1,316 +0,0 @@
-package com.casic.accessControl.feature.manager;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.core.page.Page;
-import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.marker.manager.MarkerManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.DataTableParameter;
-import com.casic.accessControl.util.DataTableUtils;
-import org.apache.commons.collections.CollectionUtils;
-import org.hibernate.Criteria;
-import org.hibernate.Query;
-import org.hibernate.criterion.Restrictions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.jdbc.object.SqlQuery;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-@Service
-public class FeatureManager extends HibernateEntityDao<Feature> {
-
-    private Logger logger = LoggerFactory.getLogger(this.getClass());
-    @Resource
-    private MarkerManager markerManager;
-
-
-    public Feature getFeatureById(Long id) {
-        Feature feature = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("id", id)).add(Restrictions.eq("isValid", 1));
-            feature = (Feature) criteria.list().get(0);
-        } catch (Exception e) {
-            return null;
-        }
-        return feature;
-    }
-
-    public FeatureDto getFeatureDtoById(Long id) {
-        return FeatureDto.convert2FeatureDto(getFeatureById(id));
-    }
-
-    /**
-     * 根据id，软删除某个点或线或片
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param ids 多个id
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public String invalidFeature(String ids) {
-        if (StringUtils.isBlank(ids) || ids.indexOf(")") != -1) {//未传入值，直接返回，防止无效查询,过滤非法请求，防止sql注入
-            return "";
-        }
-        String[] idsArr = ids.split(",");
-        StringBuilder canDeleteIds = new StringBuilder("");
-        StringBuilder cantDeleleIds = new StringBuilder("");
-        //找出能删除的和不能删除的id组合
-        for (String id : idsArr) {
-            Long longId = Long.valueOf(id);
-            if (this.isCanDelete(longId)) {
-                if (canDeleteIds.length() > 0) {
-                    canDeleteIds.append(",");
-                }
-                canDeleteIds.append(id);
-
-            } else {
-                if (cantDeleleIds.length() > 0) {
-                    cantDeleleIds.append(",");
-                }
-                cantDeleleIds.append(id);
-            }
-        }
-
-        String temp1Ids = canDeleteIds.toString();
-        String temp2Ids = cantDeleleIds.toString();
-        if (StringUtils.isNotBlank(temp2Ids)) {//有不能删除的，都不删除
-            return "";
-        }
-        Query query = this.getSession().createQuery("update Feature f set f.isValid = 0 where id in (" + temp1Ids + ")");
-        query.executeUpdate();
-
-        return "success";
-    }
-
-    /**
-     * 判断feature是否可以删除
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param id
-     * @return
-     */
-    private boolean isCanDelete(Long id) {
-        Feature feature = this.getFeatureById(id);
-        if (feature.getParent() == null) {//所有用户共用的根节点不能删除
-            return false;
-        }
-        if (CollectionUtils.isNotEmpty(feature.getChildren())) {
-            for (Feature child : feature.getChildren()) {
-                if (child.isValid() == 1) {
-                    return false;
-                }
-            }
-
-        }
-        List<Marker> markers = markerManager.getMarkerByFeature(feature);
-        if (CollectionUtils.isNotEmpty(markers)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * 将数据库中的feature信息按照参数更新
-     *
-     * @param feature
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public void saveOrupdateFeature(Feature feature, User user) {
-        this.getSession().saveOrUpdate(feature);
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param user 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByUser")
-    public List<FeatureDto> getFeaturesByUser(Integer type, User user) {
-        if (user == null) {
-            return Collections.emptyList();
-        }
-        Company company = user.getCompany();
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("type", type));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-        return FeatureDto.convert2FeatureDtos(features);
-    }
-
-    /**
-     * 分页使用，datatable获取相应type的feature某页数据
-     *
-     * @param params
-     * @param user
-     * @return
-     */
-    public DataTable<FeatureDto> getPageFeatureListByTye(String params, Feature parent, User user) {
-        DataTable<FeatureDto> result = new DataTable<FeatureDto>();
-        DataTableParameter parameter = DataTableUtils.getDataTableParameterByJsonParam(params);
-        int start = parameter.getiDisplayStart();
-        int pageSize = parameter.getiDisplayLength();
-        int pageNo = (start / pageSize) + 1;
-        Criteria criteria = this.createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        Company company = user.getCompany();
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("isValid", 1)).add(Restrictions.eq("parent", parent));
-        Page page = pagedQuery(criteria, pageNo, pageSize);
-        List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos((List<Feature>) page.getResult());
-        result.setAaData(featureDtos);
-        result.setiTotalDisplayRecords((int) page.getTotalCount());
-        result.setiTotalRecords((int) page.getTotalCount());
-        result.setsEcho(parameter.getsEcho());
-        return result;
-
-
-    }
-
-    /**
-     * 获取层次结构列表,增加缓存
-     *
-     * @param type
-     * @param company
-     * @return
-     */
-    @Cacheable(value = "getOrgList")
-    public String getOrgList(Integer type, Company company) {
-        List<OrgDto> orgDtos = new ArrayList<OrgDto>();
-        List<Feature> features = this.getRootFeatures(type);
-        for (Feature feature : features) {
-            orgDtos.add(this.getChildrenByParentId(feature.getId(), company));
-        }
-        String jsonStr = null;
-        try {
-            jsonStr = new JsonMapper().toJson(orgDtos);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return jsonStr;
-    }
-
-    //    @Cacheable(value = "getChildrenByParentId", key = "#id")
-    public OrgDto getChildrenByParentId(Long id, Company company) {
-        if (id == null) {
-            return null;
-        }
-        Feature feature = getFeatureById(id);
-        if (feature == null) {
-            return null;
-        }
-        //创建OrgDto节点
-        OrgDto orgDto = new OrgDto();
-        orgDto.setId(id); //保存ID信息
-        orgDto.setName(feature.getFeatureName());
-        if (feature.getParent() != null) {
-            orgDto.setParentId(feature.getParent().getId());
-        }
-        List<Feature> departments = this.getActiveChildrenOrgs(feature, company);
-        for (Feature fea : departments) {
-            orgDto.getChildren().add(this.getChildrenByParentId(fea.getId(), company));
-        }
-        return orgDto;
-    }
-
-    //    @Cacheable(value = "getActiveChildrenOrgs", key = "#department.getId()")
-    private List<Feature> getActiveChildrenOrgs(Feature department, Company company) {
-        List<Feature> features = new ArrayList<Feature>();
-        for (Feature feature : department.getChildren()) {
-            if (feature.isValid() == 1 && feature.getCompany().getId().equals(company.getId())) {
-                features.add(feature);
-            }
-        }
-        return features;
-    }
-
-
-    public List<Feature> getRootFeatures(Integer type) {
-        List<Feature> features = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("type", type)).add(Restrictions.isNull("parent"));
-            features = criteria.list();
-        } catch (Exception e) {
-            return Collections.emptyList();
-        }
-        return features;
-
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param company 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByCompany", key = "#company.getId()")
-    public List<Feature> getFeaturesByCompany(Company company) {
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-        criteria.add(Restrictions.eq("company", company));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-
-        for (Feature f : features) {
-            f.getChildren().toString();
-            f.getOwner().toString();
-            if (f.getParent() != null)
-                f.getParent().toString();
-        }
-        return features;
-    }
-
-    /**
-     * 根据组织结构的id获取叶子节点
-     ***重要：**已更改为包含本节点****
-     * @param type
-     * @param feature
-     * @return
-     */
-    public List<Feature> getLeafByParentId(Integer type, Feature feature) {
-        if (feature == null || feature.isValid() == 0) return Collections.emptyList();
-        List<Feature> features = new ArrayList<Feature>();
-        if (CollectionUtils.isEmpty(feature.getChildren())) {
-            features.add(feature);
-            return features;
-        }
-        List<Feature> children = feature.getChildren();
-        boolean flag = false;
-        for (Feature child : children) {
-            if (child.isValid() == 1) {
-                flag = true;
-                features.addAll(getLeafByParentId(type, child));
-            }
-        }
-//        if (!flag) {//没有有效的子节点
-            features.add(feature);
-//        }
-        return features;
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java b/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
deleted file mode 100644
index a706a36..0000000
--- a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package com.casic.accessControl.feature.web;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.Role;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.CompanyManager;
-import com.casic.accessControl.user.manager.UserManager;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.StringUtils;
-import com.casic.accessControl.xls.Common;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import sun.org.mozilla.javascript.internal.EcmaError;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.IOException;
-import java.util.*;
-
-/**
- * 提供http访问接口
- * Created by lenovo on 2016/5/16.
- */
-@Controller
-@RequestMapping(value = "feature")
-public class FeatureController {
-    @Autowired
-    private FeatureManager featureManager;
-    @Autowired
-    private UserManager userManager;
-    @Autowired
-    private CompanyManager companyManager;
-
-    @RequestMapping(value = "org-list")
-    @ResponseBody
-    public String getOrgList(@RequestParam(required = true) Integer type, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Company company = user.getCompany();
-        return featureManager.getOrgList(type, company);
-    }
-
-    @RequestMapping(value = "org-list-na")
-    @ResponseBody
-    public Map<String, String> getOrgListNa(@RequestParam Long userId) {//na端所有传过来的userid都是公司id
-        Map<String, String> res = new HashMap<String, String>();
-        res.put("message", "列表获取失败");
-        try {
-//            User user = userManager.getUserById(userId);//获取当前登录用户
-//            Company company = user.getCompany();
-            Company company = companyManager.getCompanyById(userId);
-            String areas = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.AREA.getIndex(), company);
-            String lines = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.LINE.getIndex(), company);
-            res.put("feature", areas);
-            res.put("line", lines);
-        } catch (Exception e) {
-            return res;
-        }
-        res.put("message", "成功获取");
-        return res;
-    }
-
-    @RequestMapping(value = "getFeature")
-    @ResponseBody
-    public Map<String, Object> getFeaturesByUser(@RequestParam(required = true) Integer type, HttpSession session) {
-
-        Map<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        List<FeatureDto> list = featureManager.getFeaturesByUser(type, user);
-        if (list == null) {//获取列表失败
-            result.put("message", "获取列表出现错误");
-            return result;
-        } else {
-            result.put("data", list);
-            result.put("message", "获取列表成功");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "getSubFeatureList")
-    public void getSubFeatureList(@RequestParam(required = true) String jsonParams, @RequestParam(required = false) Long parentId, HttpServletResponse response, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Feature parent = featureManager.getFeatureById(parentId);
-        DataTable<FeatureDto> dtoDataTable = featureManager.getPageFeatureListByTye(jsonParams, parent, user);
-        Gson gson = new Gson();
-        String json = gson.toJson(dtoDataTable);
-        response.setCharacterEncoding("utf-8");
-        try {
-            response.getWriter().write(json);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @RequestMapping(value = "delete")
-    @ResponseBody
-    public Map<String, Object> deleteFeatureById(@RequestParam(required = true) Long id, HttpSession session) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        try {
-            String res = featureManager.invalidFeature(id.toString());
-            if (StringUtils.isBlank(res)) {
-                result.put("message", "删除失败");
-            } else {
-                result.put("message", "删除成功");
-                result.put("success", true);
-            }
-        } catch (Exception e) {
-            result.put("message", "删除失败");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "save")
-    @ResponseBody
-    public Map<String, Object> save(@RequestParam(required = true) String params, HttpSession session) {
-        Gson gson = new Gson();
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        Map markers = gson.fromJson(params, HashMap.class);
-        String featureName = (String) markers.get("featureName");
-        String memo = (String) markers.get("memo") == null ? "" : (String) markers.get("memo");
-        Long parentId = Long.valueOf(StringUtils.isBlank((String) markers.get("parentId")) ? "-1" : (String) markers.get("parentId"));//不知为什么转过来为Double
-        Long id = Long.valueOf(StringUtils.isBlank((String) markers.get("id")) ? "-1" : (String) markers.get("id"));
-
-
-        if (StringUtils.isBlank(featureName) || parentId.equals(-1L)) {
-            result.put("message", "必要参数未传送");
-            return result;
-        }
-        Feature feature = new Feature();
-        feature.setValid(1);
-        Feature parent = featureManager.getFeatureById(parentId);
-        feature.setParent(parent);
-        feature.setFeatureName(featureName);
-        feature.setMemo(memo);
-        feature.setOwner(user);
-        feature.setCompany(user.getCompany());
-        feature.setType(parent.getType());
-        if (!id.equals(-1L)) {
-            feature.setId(id);
-        }
-        try {
-            featureManager.saveOrupdateFeature(feature, user);
-            result.put("message", "保存成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "保存失败");
-        }
-        return result;
-
-    }
-
-
-    @RequestMapping(value = "getFeatureById")
-    @ResponseBody
-    public Map<String, Object> getFeatureById(@RequestParam(required = true) Long id) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        try {
-            FeatureDto feature = featureManager.getFeatureDtoById(id);
-            result.put("data", feature);
-            result.put("message", "获取成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "获取失败");
-        }
-        return result;
-
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
index 08a290e..3f53635 100644
--- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
+++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
@@ -1,6 +1,6 @@
 package com.casic.accessControl.marker.dto;
 
-import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.domain.Feature;
 import com.casic.accessControl.marker.domain.Marker;
 import org.apache.commons.collections.CollectionUtils;
 
diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
index 080b291..7fe7434 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -4,8 +4,6 @@
 import com.casic.accessControl.core.hibernate.HibernateEntityDao;
 import com.casic.accessControl.core.page.Page;
 import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.user.domain.Company;
@@ -49,9 +47,6 @@
 public class MarkerManager extends HibernateEntityDao<Marker> {
 
     @Resource
-    private FeatureManager featureManager;
-
-    @Resource
     private UserManager userInfoManager;
 
 
@@ -154,33 +149,33 @@
 
     //获取marker
 //    @Cacheable(value = "getMarkerByFeature", key = "#feature.getId()")
-    public List<Marker> getMarkerByFeature(Feature feature) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            criteria.add(Restrictions.eq("belongLine", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            criteria.add(Restrictions.eq("belongLine", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
-    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
-            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
+//            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
     public boolean saveMarker(Marker marker) {
         try {
@@ -465,7 +460,7 @@
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setLayStyle(sheet.getCell(indexMap.get("layStyle"), i).getContents());
-                } else if(recordTypeFlag == 4) {
+                } else if (recordTypeFlag == 4) {
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setBelowType(sheet.getCell(indexMap.get("belowType"), i).getContents());
diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
index a19f2f5..7675e1f 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -2,9 +2,6 @@
 
 import com.casic.accessControl.core.ext.export.CsvExportor;
 import com.casic.accessControl.core.ext.export.TableModel;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.manager.MarkerManager;
diff --git a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java b/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
deleted file mode 100644
index e69de29..0000000
--- a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
+++ /dev/null
diff --git a/src/main/java/com/casic/accessControl/rs/FeatureResource.java b/src/main/java/com/casic/accessControl/rs/FeatureResource.java
index 68aeb97..e97f18b 100644
--- a/src/main/java/com/casic/accessControl/rs/FeatureResource.java
+++ b/src/main/java/com/casic/accessControl/rs/FeatureResource.java
@@ -1,65 +1,65 @@
-package com.casic.accessControl.rs;
-
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.UserManager;
-import com.google.gson.Gson;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import javax.annotation.Resource;
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
-* Created by admin on 2015/1/15.
-*/
-@Component
-@Path("feature")
-public class FeatureResource
-{
-    private static Logger logger = LoggerFactory.getLogger(FeatureResource.class);
-
-    @Resource
-    private UserManager userManager;
-
-    @Resource
-    private FeatureManager featureManager;
-
-    @GET
-    @Path("get")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map get(@QueryParam("userName") String userName ){
-        Map map = new HashMap<String, Object>();
-        try {
-            User user = userManager.getUserByName(userName);
-            if (user == null) {
-                map.put("success", "false");
-                map.put("message", "人员不存在！");
-                return map;
-            }
-            Company company = user.getCompany();
-            if (company!=null)
-            {
-                List<Feature> features = featureManager.getFeaturesByCompany(company);
-                List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos(features);
-                map.put("success", "true");
-                map.put("message", featureDtos);
-            }
-        }
-        catch (Exception e)
-        {
-            map.put("success", "false");
-            map.put("message", e.getMessage());
-        }
-        return  map;
-    }
-}
+//package com.casic.accessControl.rs;
+//
+//import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.dto.FeatureDto;
+//import com.casic.accessControl.feature.manager.FeatureManager;
+//import com.casic.accessControl.user.domain.Company;
+//import com.casic.accessControl.user.domain.User;
+//import com.casic.accessControl.user.manager.UserManager;
+//import com.google.gson.Gson;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.stereotype.Component;
+//import org.springframework.web.bind.annotation.RequestParam;
+//
+//import javax.annotation.Resource;
+//import javax.ws.rs.*;
+//import javax.ws.rs.core.MediaType;
+//import java.util.HashMap;
+//import java.util.List;
+//import java.util.Map;
+//
+///**
+//* Created by admin on 2015/1/15.
+//*/
+//@Component
+//@Path("feature")
+//public class FeatureResource
+//{
+//    private static Logger logger = LoggerFactory.getLogger(FeatureResource.class);
+//
+//    @Resource
+//    private UserManager userManager;
+//
+//    @Resource
+//    private FeatureManager featureManager;
+//
+//    @GET
+//    @Path("get")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public Map get(@QueryParam("userName") String userName ){
+//        Map map = new HashMap<String, Object>();
+//        try {
+//            User user = userManager.getUserByName(userName);
+//            if (user == null) {
+//                map.put("success", "false");
+//                map.put("message", "人员不存在！");
+//                return map;
+//            }
+//            Company company = user.getCompany();
+//            if (company!=null)
+//            {
+//                List<Feature> features = featureManager.getFeaturesByCompany(company);
+//                List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos(features);
+//                map.put("success", "true");
+//                map.put("message", featureDtos);
+//            }
+//        }
+//        catch (Exception e)
+//        {
+//            map.put("success", "false");
+//            map.put("message", e.getMessage());
+//        }
+//        return  map;
+//    }
+//}
diff --git a/src/main/java/com/casic/accessControl/rs/MapInfo.java b/src/main/java/com/casic/accessControl/rs/MapInfo.java
deleted file mode 100644
index a77fce9..0000000
--- a/src/main/java/com/casic/accessControl/rs/MapInfo.java
+++ /dev/null
@@ -1,131 +0,0 @@
-//package com.casic.accessControl.rs;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-///**
-// * Created by admin on 2015/8/26.
-// */
-//public class MapInfo {
-//
-//    private String mapUrl;
-//
-//    private String updateTime;
-//
-//    private String uploader;
-//
-//    private String name;
-//
-//    private String uuid;
-//
-//    private String site;
-//    /*
-//    0:草稿
-//    1：待审核
-//    2：通过
-//    3: 驳回
-//     */
-//    private String status;
-//
-//    //
-//    private int id;
-//
-//
-//    public String getMapUrl()
-//    {
-//        return mapUrl;
-//    }
-//
-//    public void setMapUrl(String mapUrl)
-//    {
-//        this.mapUrl = mapUrl;
-//    }
-//
-//    public String getUpdateTime()
-//    {
-//        return updateTime;
-//    }
-//
-//    public void setUpdateTime(String updateTime)
-//    {
-//        this.updateTime = updateTime;
-//    }
-//
-//    public String getUploader()
-//    {
-//        return uploader;
-//    }
-//
-//    public void setUploader(String uploader)
-//    {
-//        this.uploader = uploader;
-//    }
-//
-//    public String getName()
-//    {
-//        return name;
-//    }
-//
-//    public void setName(String name)
-//    {
-//        this.name = name;
-//    }
-//
-//    public String getUuid()
-//    {
-//        return uuid;
-//    }
-//
-//    public void setUuid(String uuid)
-//    {
-//        this.uuid = uuid;
-//    }
-//
-//    public String getSite()
-//    {
-//        return site;
-//    }
-//
-//    public void setSite(String site)
-//    {
-//        this.site = site;
-//    }
-//
-//    public String getStatus()
-//    {
-//        return status;
-//    }
-//
-//    public void setStatus(String status)
-//    {
-//        this.status = status;
-//    }
-//
-//    public int getId()
-//    {
-//        return id;
-//    }
-//
-//    public void setId(int id)
-//    {
-//        this.id = id;
-//    }
-//
-//    public static List<MapInfo> getMockerMaps()
-//    {
-//        List<MapInfo> maps = new ArrayList<MapInfo>();
-//        for (int i = 0; i < 20; i++)
-//        {
-//            MapInfo map = new MapInfo();
-//            map.setId(i);
-//            map.setUploader("张帆");
-//            map.setMapUrl("http://192.168.0.111:9080/accessControl/logo.jpg");
-//            map.setSite("永旺路"+i);
-//            map.setUpdateTime("2015-08-02");
-//            map.setStatus("待审核");
-//            maps.add(map);
-//        }
-//        return maps;
-//
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/rs/MarkResource.java b/src/main/java/com/casic/accessControl/rs/MarkResource.java
index 8ae4d85..cef1580 100644
--- a/src/main/java/com/casic/accessControl/rs/MarkResource.java
+++ b/src/main/java/com/casic/accessControl/rs/MarkResource.java
@@ -1,7 +1,7 @@
 package com.casic.accessControl.rs;
 
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
+//import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.manager.MarkerManager;
 import com.casic.accessControl.user.domain.Company;
@@ -35,8 +35,8 @@
     @Resource
     private MarkerManager markerManager;
 
-    @Resource
-    private FeatureManager featureManager;
+//    @Resource
+//    private FeatureManager featureManager;
 
     @GET
     @Path("post")
diff --git a/src/main/java/com/casic/accessControl/rs/UserObj.java b/src/main/java/com/casic/accessControl/rs/UserObj.java
deleted file mode 100644
index c0fe651..0000000
--- a/src/main/java/com/casic/accessControl/rs/UserObj.java
+++ /dev/null
@@ -1,61 +0,0 @@
-//package com.casic.accessControl.rs;
-//
-//import java.io.Serializable;
-//
-///**
-// * Created by admin on 2015/10/9.
-// */
-//public class UserObj implements Serializable {
-//    private String userName;
-//    private String password;
-//    private String appId;
-//    /*
-//    roles:��ɫ֮���Զ��ŷָ�
-//     */
-//    private String roles;
-//
-//    /*
-//    authorities:Ȩ��֮���Զ��ŷָ�
-//    */
-//    private String authorities;
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public String getPassword() {
-//        return password;
-//    }
-//
-//    public void setPassword(String password) {
-//        this.password = password;
-//    }
-//
-//    public String getAppId() {
-//        return appId;
-//    }
-//
-//    public void setAppId(String appId) {
-//        this.appId = appId;
-//    }
-//
-//    public String getRoles() {
-//        return roles;
-//    }
-//
-//    public void setRoles(String roles) {
-//        this.roles = roles;
-//    }
-//
-//    public String getAuthorities() {
-//        return authorities;
-//    }
-//
-//    public void setAuthorities(String authorities) {
-//        this.authorities = authorities;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java b/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java
deleted file mode 100644
index ac60ed5..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java
+++ /dev/null
@@ -1,65 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//import org.geotools.referencing.operation.transform.NADCONTransform;
-//
-//import javax.persistence.*;
-//
-///**
-// * Created by test203 on 2015/10/29.
-// */
-//@Entity
-//@Table(name = "ZX_DATABASE_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_DATABASE_INFO_ID", sequenceName = "SEQ_ZX_DATABASE_INFO_ID", allocationSize = 1, initialValue = 1)
-//public class DataBaseInfo {
-//    private Long id;
-//    private String account;
-//    private String password;
-//    private String sid;
-//    private String owner;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_ZX_DATABASE_INFO_ID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "ACCOUNT", nullable = false)
-//    public String getAccount() {
-//        return account;
-//    }
-//
-//    public void setAccount(String account) {
-//        this.account = account;
-//    }
-//
-//    @Column(name = "PASSWORD", nullable = false)
-//    public String getPassword() {
-//        return password;
-//    }
-//
-//    public void setPassword(String password) {
-//        this.password = password;
-//    }
-//
-//    @Column(name = "SID", nullable = false)
-//    public String getSid() {
-//        return sid;
-//    }
-//
-//    public void setSid(String sid) {
-//        this.sid = sid;
-//    }
-//
-//    @Column(name = "OWNER", nullable = false)
-//    public String getOwner() {
-//        return owner;
-//    }
-//
-//    public void setOwner(String owner) {
-//        this.owner = owner;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java b/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java
deleted file mode 100644
index 9578060..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java
+++ /dev/null
@@ -1,77 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//import com.casic.accessControl.org.domain.UserInfo;
-//
-//import javax.persistence.*;
-//import java.util.Date;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Entity
-//@Table(name = "ZX_ORCL_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_ORCL_INFO_ID",sequenceName = "SEQ_ZX_ORCL_INFO_ID",allocationSize = 1,initialValue = 1)
-//public class OrclInfo {
-//    private Long id;
-//    private String fileName;
-//    private String filePath;
-//    private String memo;
-//    private Date bkDay = new Date();
-//    private UserInfo userInfo;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE,generator = "SEQ_ZX_ORCL_INFO_ID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "FILE_NAME",nullable = false)
-//    public String getFileName() {
-//        return fileName;
-//    }
-//
-//    public void setFileName(String fileName) {
-//        this.fileName = fileName;
-//    }
-//
-//    @Column(name = "FILE_PATH",nullable = false)
-//    public String getFilePath() {
-//        return filePath;
-//    }
-//
-//    public void setFilePath(String filePath) {
-//        this.filePath = filePath;
-//    }
-//
-//    @Column(name = "MEMO")
-//    public String getMemo() {
-//        return memo;
-//    }
-//
-//    public void setMemo(String memo) {
-//        this.memo = memo;
-//    }
-//
-//    @Column(name = "BK_DAY")
-//    public Date getBkDay() {
-//        return bkDay;
-//    }
-//
-//    public void setBkDay(Date bkDay) {
-//        this.bkDay = bkDay;
-//    }
-//
-//    @ManyToOne(fetch = FetchType.LAZY)
-//    @JoinColumn(name = "USER_ID")
-//    public UserInfo getUserInfo() {
-//        return userInfo;
-//    }
-//
-//    public void setUserInfo(UserInfo userInfo) {
-//        this.userInfo = userInfo;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/SysLogInfo.java b/src/main/java/com/casic/accessControl/sys/domain/SysLogInfo.java
deleted file mode 100644
index 60e5583..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/SysLogInfo.java
+++ /dev/null
@@ -1,70 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//
-//import com.casic.accessControl.user.domain.UserInfo;
-//
-//import javax.persistence.*;
-//import java.io.Serializable;
-//import java.util.Date;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Entity
-//@Table(name = "ZX_SYS_LOG_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_SYS_LOG_ID",sequenceName = "SEQ_ZX_SYS_LOG_ID",allocationSize = 1,initialValue = 1)
-//public class SysLogInfo implements Serializable{
-//    private Long id;
-//    private String logType;//系统日志、运行日志、操作日志
-//    private String msg;
-//    private Date logDay = new Date();
-//    private UserInfo user;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE,generator = "SEQ_ZX_SYS_LOG_ID")
-//    @Column(name = "DBID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "LOG_TYPE",nullable = false)
-//    public String getLogType() {
-//        return logType;
-//    }
-//
-//    public void setLogType(String logType) {
-//        this.logType = logType;
-//    }
-//
-//    @Column(name = "LOG_MSG",nullable = false)
-//    public String getMsg() {
-//        return msg;
-//    }
-//
-//    public void setMsg(String msg) {
-//        this.msg = msg;
-//    }
-//
-//    @Column(name = "LOG_DAY")
-//    public Date getLogDay() {
-//        return logDay;
-//    }
-//
-//    public void setLogDay(Date logDay) {
-//        this.logDay = logDay;
-//    }
-//
-//    @ManyToOne(fetch = FetchType.LAZY)
-//    @JoinColumn(name = "USER_ID")
-//    public UserInfo getUser() {
-//        return user;
-//    }
-//
-//    public void setUser(UserInfo user) {
-//        this.user = user;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/dto/ExcelInfoDTO.java b/src/main/java/com/casic/accessControl/sys/dto/ExcelInfoDTO.java
deleted file mode 100644
index 2fe496e..0000000
--- a/src/main/java/com/casic/accessControl/sys/dto/ExcelInfoDTO.java
+++ /dev/null
@@ -1,77 +0,0 @@
-//package com.casic.accessControl.sys.dto;
-//
-//import com.casic.accessControl.sys.domain.SysLogInfo;
-//import com.casic.accessControl.util.DateUtils;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-///**
-// * Created by test203 on 2015/10/23.
-// */
-//public class ExcelInfoDTO {
-//    private String logType;//系统日志、运行日志、操作日志
-//    private String msg;
-//    private String logDay;
-//    private String userName;
-//
-//    public String getLogType() {
-//        return logType;
-//    }
-//
-//    public void setLogType(String logType) {
-//        this.logType = logType;
-//    }
-//
-//    public String getMsg() {
-//        return msg;
-//    }
-//
-//    public void setMsg(String msg) {
-//        this.msg = msg;
-//    }
-//
-//    public String getLogDay() {
-//        return logDay;
-//    }
-//
-//    public void setLogDay(String logDay) {
-//        this.logDay = logDay;
-//    }
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public static ExcelInfoDTO ConvertToDTO(SysLogInfo logInfo){
-//        if(null!=logInfo){
-//            ExcelInfoDTO dto = new ExcelInfoDTO();
-//            dto.setLogType(logInfo.getLogType());
-//            if(null!=logInfo.getLogDay()){
-//                dto.setLogDay(DateUtils.sdf2.format(logInfo.getLogDay()));
-//            }else {
-//                dto.setLogDay(" ");
-//            }
-//            dto.setMsg(logInfo.getMsg());
-//            if(null!=logInfo.getUser()){
-//                dto.setUserName(logInfo.getUser().getUserName());
-//            }else {
-//                dto.setUserName(" ");
-//            }
-//            return dto;
-//        }
-//        return new ExcelInfoDTO();
-//    }
-//
-//    public static List<ExcelInfoDTO> ConvertToDTO(List<SysLogInfo> list){
-//        List<ExcelInfoDTO> dtoList = new ArrayList<ExcelInfoDTO>();
-//        for(SysLogInfo log : list){
-//            dtoList.add(ConvertToDTO(log));
-//        }
-//        return dtoList;
-//    }
-//}

diff --git a/src/main/java/com/casic/accessControl/feature/domain/Feature.java b/src/main/java/com/casic/accessControl/feature/domain/Feature.java
deleted file mode 100644
index c89a0c2..0000000
--- a/src/main/java/com/casic/accessControl/feature/domain/Feature.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.casic.accessControl.feature.domain;
-
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-
-import javax.persistence.*;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-//点的信息
-@Entity
-@Table(name = "feature")
-public class Feature {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private Long id;
-    @Column(name = "longitude")
-    private Double longitude;
-    @Column(name = "latitude")
-    private Double latitude;
-    @Column(name = "featureName")
-    private String featureName;
-    @Column(name = "type")
-    private int type;
-    @Column(name = "isValid")
-    private Integer isValid;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "parent")
-    private Feature parent;
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "parent")
-    private List<Feature> children;
-    @Column(name = "memo")
-    private String memo;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "owner", referencedColumnName = "id")
-    private User owner;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "company", referencedColumnName = "id")
-    private Company company;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer isValid() {
-        return isValid;
-    }
-
-    public void setValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public Feature getParent() {
-        return parent;
-    }
-
-    public void setParent(Feature parent) {
-        this.parent = parent;
-    }
-
-    public List<Feature> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<Feature> children) {
-        this.children = children;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public User getOwner() {
-        return owner;
-    }
-
-    public void setOwner(User owner) {
-        this.owner = owner;
-    }
-
-    public Company getCompany() {
-        return company;
-    }
-
-    public void setCompany(Company company) {
-        this.company = company;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java b/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
deleted file mode 100644
index 256f261..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import com.casic.accessControl.feature.domain.Feature;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/17.
- */
-public class FeatureDto {
-    private Long id;
-    private Double longitude;
-    private Double latitude;
-    private String featureName;
-    private int type;
-    private Integer isValid;
-    private String memo;
-    private Long parentId;
-
-    private String btnEdit = "<a href='#' class='btn mini blue'><i class='icon-edit'></i>编辑</a>";
-    private String btnDelete = "<a href='#' class='btn mini red'><i class='icon-trash'></i>删除</a>";
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer getIsValid() {
-        return isValid;
-    }
-
-    public void setIsValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public Long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getBtnEdit() {
-        return btnEdit;
-    }
-
-    public void setBtnEdit(String btnEdit) {
-        this.btnEdit = btnEdit;
-    }
-
-    public String getBtnDelete() {
-        return btnDelete;
-    }
-
-    public void setBtnDelete(String btnDelete) {
-        this.btnDelete = btnDelete;
-    }
-
-    public static FeatureDto convert2FeatureDto(Feature feature) {
-        if (feature == null) {
-            return null;
-        }
-        FeatureDto featureDto = new FeatureDto();
-        featureDto.setId(feature.getId());
-        featureDto.setFeatureName(feature.getFeatureName());
-        featureDto.setIsValid(feature.isValid());
-        featureDto.setLatitude(feature.getLatitude());
-        featureDto.setLongitude(feature.getLongitude());
-        featureDto.setMemo(feature.getMemo());
-        featureDto.setType(feature.getType());
-        if (feature.getParent() != null)
-            featureDto.setParentId(feature.getParent().getId());
-        return featureDto;
-    }
-
-    public static List<FeatureDto> convert2FeatureDtos(List<Feature> features) {
-        List<FeatureDto> featureDtos = new ArrayList<FeatureDto>();
-        for (Feature feature : features) {
-            featureDtos.add(convert2FeatureDto(feature));
-        }
-        return featureDtos;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java b/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
deleted file mode 100644
index 785dcba..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/19.
- */
-public class OrgDto {
-    private long id;
-
-    private String name;
-
-    private long parentId;
-
-    private List<OrgDto> children = new ArrayList<OrgDto>();
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(long parentId) {
-        this.parentId = parentId;
-    }
-
-    public List<OrgDto> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<OrgDto> children) {
-        this.children = children;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java b/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
deleted file mode 100644
index a475e21..0000000
--- a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
+++ /dev/null
@@ -1,316 +0,0 @@
-package com.casic.accessControl.feature.manager;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.core.page.Page;
-import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.marker.manager.MarkerManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.DataTableParameter;
-import com.casic.accessControl.util.DataTableUtils;
-import org.apache.commons.collections.CollectionUtils;
-import org.hibernate.Criteria;
-import org.hibernate.Query;
-import org.hibernate.criterion.Restrictions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.jdbc.object.SqlQuery;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-@Service
-public class FeatureManager extends HibernateEntityDao<Feature> {
-
-    private Logger logger = LoggerFactory.getLogger(this.getClass());
-    @Resource
-    private MarkerManager markerManager;
-
-
-    public Feature getFeatureById(Long id) {
-        Feature feature = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("id", id)).add(Restrictions.eq("isValid", 1));
-            feature = (Feature) criteria.list().get(0);
-        } catch (Exception e) {
-            return null;
-        }
-        return feature;
-    }
-
-    public FeatureDto getFeatureDtoById(Long id) {
-        return FeatureDto.convert2FeatureDto(getFeatureById(id));
-    }
-
-    /**
-     * 根据id，软删除某个点或线或片
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param ids 多个id
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public String invalidFeature(String ids) {
-        if (StringUtils.isBlank(ids) || ids.indexOf(")") != -1) {//未传入值，直接返回，防止无效查询,过滤非法请求，防止sql注入
-            return "";
-        }
-        String[] idsArr = ids.split(",");
-        StringBuilder canDeleteIds = new StringBuilder("");
-        StringBuilder cantDeleleIds = new StringBuilder("");
-        //找出能删除的和不能删除的id组合
-        for (String id : idsArr) {
-            Long longId = Long.valueOf(id);
-            if (this.isCanDelete(longId)) {
-                if (canDeleteIds.length() > 0) {
-                    canDeleteIds.append(",");
-                }
-                canDeleteIds.append(id);
-
-            } else {
-                if (cantDeleleIds.length() > 0) {
-                    cantDeleleIds.append(",");
-                }
-                cantDeleleIds.append(id);
-            }
-        }
-
-        String temp1Ids = canDeleteIds.toString();
-        String temp2Ids = cantDeleleIds.toString();
-        if (StringUtils.isNotBlank(temp2Ids)) {//有不能删除的，都不删除
-            return "";
-        }
-        Query query = this.getSession().createQuery("update Feature f set f.isValid = 0 where id in (" + temp1Ids + ")");
-        query.executeUpdate();
-
-        return "success";
-    }
-
-    /**
-     * 判断feature是否可以删除
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param id
-     * @return
-     */
-    private boolean isCanDelete(Long id) {
-        Feature feature = this.getFeatureById(id);
-        if (feature.getParent() == null) {//所有用户共用的根节点不能删除
-            return false;
-        }
-        if (CollectionUtils.isNotEmpty(feature.getChildren())) {
-            for (Feature child : feature.getChildren()) {
-                if (child.isValid() == 1) {
-                    return false;
-                }
-            }
-
-        }
-        List<Marker> markers = markerManager.getMarkerByFeature(feature);
-        if (CollectionUtils.isNotEmpty(markers)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * 将数据库中的feature信息按照参数更新
-     *
-     * @param feature
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public void saveOrupdateFeature(Feature feature, User user) {
-        this.getSession().saveOrUpdate(feature);
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param user 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByUser")
-    public List<FeatureDto> getFeaturesByUser(Integer type, User user) {
-        if (user == null) {
-            return Collections.emptyList();
-        }
-        Company company = user.getCompany();
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("type", type));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-        return FeatureDto.convert2FeatureDtos(features);
-    }
-
-    /**
-     * 分页使用，datatable获取相应type的feature某页数据
-     *
-     * @param params
-     * @param user
-     * @return
-     */
-    public DataTable<FeatureDto> getPageFeatureListByTye(String params, Feature parent, User user) {
-        DataTable<FeatureDto> result = new DataTable<FeatureDto>();
-        DataTableParameter parameter = DataTableUtils.getDataTableParameterByJsonParam(params);
-        int start = parameter.getiDisplayStart();
-        int pageSize = parameter.getiDisplayLength();
-        int pageNo = (start / pageSize) + 1;
-        Criteria criteria = this.createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        Company company = user.getCompany();
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("isValid", 1)).add(Restrictions.eq("parent", parent));
-        Page page = pagedQuery(criteria, pageNo, pageSize);
-        List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos((List<Feature>) page.getResult());
-        result.setAaData(featureDtos);
-        result.setiTotalDisplayRecords((int) page.getTotalCount());
-        result.setiTotalRecords((int) page.getTotalCount());
-        result.setsEcho(parameter.getsEcho());
-        return result;
-
-
-    }
-
-    /**
-     * 获取层次结构列表,增加缓存
-     *
-     * @param type
-     * @param company
-     * @return
-     */
-    @Cacheable(value = "getOrgList")
-    public String getOrgList(Integer type, Company company) {
-        List<OrgDto> orgDtos = new ArrayList<OrgDto>();
-        List<Feature> features = this.getRootFeatures(type);
-        for (Feature feature : features) {
-            orgDtos.add(this.getChildrenByParentId(feature.getId(), company));
-        }
-        String jsonStr = null;
-        try {
-            jsonStr = new JsonMapper().toJson(orgDtos);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return jsonStr;
-    }
-
-    //    @Cacheable(value = "getChildrenByParentId", key = "#id")
-    public OrgDto getChildrenByParentId(Long id, Company company) {
-        if (id == null) {
-            return null;
-        }
-        Feature feature = getFeatureById(id);
-        if (feature == null) {
-            return null;
-        }
-        //创建OrgDto节点
-        OrgDto orgDto = new OrgDto();
-        orgDto.setId(id); //保存ID信息
-        orgDto.setName(feature.getFeatureName());
-        if (feature.getParent() != null) {
-            orgDto.setParentId(feature.getParent().getId());
-        }
-        List<Feature> departments = this.getActiveChildrenOrgs(feature, company);
-        for (Feature fea : departments) {
-            orgDto.getChildren().add(this.getChildrenByParentId(fea.getId(), company));
-        }
-        return orgDto;
-    }
-
-    //    @Cacheable(value = "getActiveChildrenOrgs", key = "#department.getId()")
-    private List<Feature> getActiveChildrenOrgs(Feature department, Company company) {
-        List<Feature> features = new ArrayList<Feature>();
-        for (Feature feature : department.getChildren()) {
-            if (feature.isValid() == 1 && feature.getCompany().getId().equals(company.getId())) {
-                features.add(feature);
-            }
-        }
-        return features;
-    }
-
-
-    public List<Feature> getRootFeatures(Integer type) {
-        List<Feature> features = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("type", type)).add(Restrictions.isNull("parent"));
-            features = criteria.list();
-        } catch (Exception e) {
-            return Collections.emptyList();
-        }
-        return features;
-
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param company 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByCompany", key = "#company.getId()")
-    public List<Feature> getFeaturesByCompany(Company company) {
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-        criteria.add(Restrictions.eq("company", company));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-
-        for (Feature f : features) {
-            f.getChildren().toString();
-            f.getOwner().toString();
-            if (f.getParent() != null)
-                f.getParent().toString();
-        }
-        return features;
-    }
-
-    /**
-     * 根据组织结构的id获取叶子节点
-     ***重要：**已更改为包含本节点****
-     * @param type
-     * @param feature
-     * @return
-     */
-    public List<Feature> getLeafByParentId(Integer type, Feature feature) {
-        if (feature == null || feature.isValid() == 0) return Collections.emptyList();
-        List<Feature> features = new ArrayList<Feature>();
-        if (CollectionUtils.isEmpty(feature.getChildren())) {
-            features.add(feature);
-            return features;
-        }
-        List<Feature> children = feature.getChildren();
-        boolean flag = false;
-        for (Feature child : children) {
-            if (child.isValid() == 1) {
-                flag = true;
-                features.addAll(getLeafByParentId(type, child));
-            }
-        }
-//        if (!flag) {//没有有效的子节点
-            features.add(feature);
-//        }
-        return features;
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java b/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
deleted file mode 100644
index a706a36..0000000
--- a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package com.casic.accessControl.feature.web;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.Role;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.CompanyManager;
-import com.casic.accessControl.user.manager.UserManager;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.StringUtils;
-import com.casic.accessControl.xls.Common;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import sun.org.mozilla.javascript.internal.EcmaError;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.IOException;
-import java.util.*;
-
-/**
- * 提供http访问接口
- * Created by lenovo on 2016/5/16.
- */
-@Controller
-@RequestMapping(value = "feature")
-public class FeatureController {
-    @Autowired
-    private FeatureManager featureManager;
-    @Autowired
-    private UserManager userManager;
-    @Autowired
-    private CompanyManager companyManager;
-
-    @RequestMapping(value = "org-list")
-    @ResponseBody
-    public String getOrgList(@RequestParam(required = true) Integer type, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Company company = user.getCompany();
-        return featureManager.getOrgList(type, company);
-    }
-
-    @RequestMapping(value = "org-list-na")
-    @ResponseBody
-    public Map<String, String> getOrgListNa(@RequestParam Long userId) {//na端所有传过来的userid都是公司id
-        Map<String, String> res = new HashMap<String, String>();
-        res.put("message", "列表获取失败");
-        try {
-//            User user = userManager.getUserById(userId);//获取当前登录用户
-//            Company company = user.getCompany();
-            Company company = companyManager.getCompanyById(userId);
-            String areas = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.AREA.getIndex(), company);
-            String lines = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.LINE.getIndex(), company);
-            res.put("feature", areas);
-            res.put("line", lines);
-        } catch (Exception e) {
-            return res;
-        }
-        res.put("message", "成功获取");
-        return res;
-    }
-
-    @RequestMapping(value = "getFeature")
-    @ResponseBody
-    public Map<String, Object> getFeaturesByUser(@RequestParam(required = true) Integer type, HttpSession session) {
-
-        Map<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        List<FeatureDto> list = featureManager.getFeaturesByUser(type, user);
-        if (list == null) {//获取列表失败
-            result.put("message", "获取列表出现错误");
-            return result;
-        } else {
-            result.put("data", list);
-            result.put("message", "获取列表成功");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "getSubFeatureList")
-    public void getSubFeatureList(@RequestParam(required = true) String jsonParams, @RequestParam(required = false) Long parentId, HttpServletResponse response, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Feature parent = featureManager.getFeatureById(parentId);
-        DataTable<FeatureDto> dtoDataTable = featureManager.getPageFeatureListByTye(jsonParams, parent, user);
-        Gson gson = new Gson();
-        String json = gson.toJson(dtoDataTable);
-        response.setCharacterEncoding("utf-8");
-        try {
-            response.getWriter().write(json);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @RequestMapping(value = "delete")
-    @ResponseBody
-    public Map<String, Object> deleteFeatureById(@RequestParam(required = true) Long id, HttpSession session) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        try {
-            String res = featureManager.invalidFeature(id.toString());
-            if (StringUtils.isBlank(res)) {
-                result.put("message", "删除失败");
-            } else {
-                result.put("message", "删除成功");
-                result.put("success", true);
-            }
-        } catch (Exception e) {
-            result.put("message", "删除失败");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "save")
-    @ResponseBody
-    public Map<String, Object> save(@RequestParam(required = true) String params, HttpSession session) {
-        Gson gson = new Gson();
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        Map markers = gson.fromJson(params, HashMap.class);
-        String featureName = (String) markers.get("featureName");
-        String memo = (String) markers.get("memo") == null ? "" : (String) markers.get("memo");
-        Long parentId = Long.valueOf(StringUtils.isBlank((String) markers.get("parentId")) ? "-1" : (String) markers.get("parentId"));//不知为什么转过来为Double
-        Long id = Long.valueOf(StringUtils.isBlank((String) markers.get("id")) ? "-1" : (String) markers.get("id"));
-
-
-        if (StringUtils.isBlank(featureName) || parentId.equals(-1L)) {
-            result.put("message", "必要参数未传送");
-            return result;
-        }
-        Feature feature = new Feature();
-        feature.setValid(1);
-        Feature parent = featureManager.getFeatureById(parentId);
-        feature.setParent(parent);
-        feature.setFeatureName(featureName);
-        feature.setMemo(memo);
-        feature.setOwner(user);
-        feature.setCompany(user.getCompany());
-        feature.setType(parent.getType());
-        if (!id.equals(-1L)) {
-            feature.setId(id);
-        }
-        try {
-            featureManager.saveOrupdateFeature(feature, user);
-            result.put("message", "保存成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "保存失败");
-        }
-        return result;
-
-    }
-
-
-    @RequestMapping(value = "getFeatureById")
-    @ResponseBody
-    public Map<String, Object> getFeatureById(@RequestParam(required = true) Long id) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        try {
-            FeatureDto feature = featureManager.getFeatureDtoById(id);
-            result.put("data", feature);
-            result.put("message", "获取成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "获取失败");
-        }
-        return result;
-
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
index 08a290e..3f53635 100644
--- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
+++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
@@ -1,6 +1,6 @@
 package com.casic.accessControl.marker.dto;
 
-import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.domain.Feature;
 import com.casic.accessControl.marker.domain.Marker;
 import org.apache.commons.collections.CollectionUtils;
 
diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
index 080b291..7fe7434 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -4,8 +4,6 @@
 import com.casic.accessControl.core.hibernate.HibernateEntityDao;
 import com.casic.accessControl.core.page.Page;
 import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.user.domain.Company;
@@ -49,9 +47,6 @@
 public class MarkerManager extends HibernateEntityDao<Marker> {
 
     @Resource
-    private FeatureManager featureManager;
-
-    @Resource
     private UserManager userInfoManager;
 
 
@@ -154,33 +149,33 @@
 
     //获取marker
 //    @Cacheable(value = "getMarkerByFeature", key = "#feature.getId()")
-    public List<Marker> getMarkerByFeature(Feature feature) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            criteria.add(Restrictions.eq("belongLine", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            criteria.add(Restrictions.eq("belongLine", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
-    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
-            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
+//            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
     public boolean saveMarker(Marker marker) {
         try {
@@ -465,7 +460,7 @@
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setLayStyle(sheet.getCell(indexMap.get("layStyle"), i).getContents());
-                } else if(recordTypeFlag == 4) {
+                } else if (recordTypeFlag == 4) {
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setBelowType(sheet.getCell(indexMap.get("belowType"), i).getContents());
diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
index a19f2f5..7675e1f 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -2,9 +2,6 @@
 
 import com.casic.accessControl.core.ext.export.CsvExportor;
 import com.casic.accessControl.core.ext.export.TableModel;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.manager.MarkerManager;
diff --git a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java b/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
deleted file mode 100644
index e69de29..0000000
--- a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
+++ /dev/null
diff --git a/src/main/java/com/casic/accessControl/rs/FeatureResource.java b/src/main/java/com/casic/accessControl/rs/FeatureResource.java
index 68aeb97..e97f18b 100644
--- a/src/main/java/com/casic/accessControl/rs/FeatureResource.java
+++ b/src/main/java/com/casic/accessControl/rs/FeatureResource.java
@@ -1,65 +1,65 @@
-package com.casic.accessControl.rs;
-
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.UserManager;
-import com.google.gson.Gson;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import javax.annotation.Resource;
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
-* Created by admin on 2015/1/15.
-*/
-@Component
-@Path("feature")
-public class FeatureResource
-{
-    private static Logger logger = LoggerFactory.getLogger(FeatureResource.class);
-
-    @Resource
-    private UserManager userManager;
-
-    @Resource
-    private FeatureManager featureManager;
-
-    @GET
-    @Path("get")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map get(@QueryParam("userName") String userName ){
-        Map map = new HashMap<String, Object>();
-        try {
-            User user = userManager.getUserByName(userName);
-            if (user == null) {
-                map.put("success", "false");
-                map.put("message", "人员不存在！");
-                return map;
-            }
-            Company company = user.getCompany();
-            if (company!=null)
-            {
-                List<Feature> features = featureManager.getFeaturesByCompany(company);
-                List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos(features);
-                map.put("success", "true");
-                map.put("message", featureDtos);
-            }
-        }
-        catch (Exception e)
-        {
-            map.put("success", "false");
-            map.put("message", e.getMessage());
-        }
-        return  map;
-    }
-}
+//package com.casic.accessControl.rs;
+//
+//import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.dto.FeatureDto;
+//import com.casic.accessControl.feature.manager.FeatureManager;
+//import com.casic.accessControl.user.domain.Company;
+//import com.casic.accessControl.user.domain.User;
+//import com.casic.accessControl.user.manager.UserManager;
+//import com.google.gson.Gson;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.stereotype.Component;
+//import org.springframework.web.bind.annotation.RequestParam;
+//
+//import javax.annotation.Resource;
+//import javax.ws.rs.*;
+//import javax.ws.rs.core.MediaType;
+//import java.util.HashMap;
+//import java.util.List;
+//import java.util.Map;
+//
+///**
+//* Created by admin on 2015/1/15.
+//*/
+//@Component
+//@Path("feature")
+//public class FeatureResource
+//{
+//    private static Logger logger = LoggerFactory.getLogger(FeatureResource.class);
+//
+//    @Resource
+//    private UserManager userManager;
+//
+//    @Resource
+//    private FeatureManager featureManager;
+//
+//    @GET
+//    @Path("get")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public Map get(@QueryParam("userName") String userName ){
+//        Map map = new HashMap<String, Object>();
+//        try {
+//            User user = userManager.getUserByName(userName);
+//            if (user == null) {
+//                map.put("success", "false");
+//                map.put("message", "人员不存在！");
+//                return map;
+//            }
+//            Company company = user.getCompany();
+//            if (company!=null)
+//            {
+//                List<Feature> features = featureManager.getFeaturesByCompany(company);
+//                List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos(features);
+//                map.put("success", "true");
+//                map.put("message", featureDtos);
+//            }
+//        }
+//        catch (Exception e)
+//        {
+//            map.put("success", "false");
+//            map.put("message", e.getMessage());
+//        }
+//        return  map;
+//    }
+//}
diff --git a/src/main/java/com/casic/accessControl/rs/MapInfo.java b/src/main/java/com/casic/accessControl/rs/MapInfo.java
deleted file mode 100644
index a77fce9..0000000
--- a/src/main/java/com/casic/accessControl/rs/MapInfo.java
+++ /dev/null
@@ -1,131 +0,0 @@
-//package com.casic.accessControl.rs;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-///**
-// * Created by admin on 2015/8/26.
-// */
-//public class MapInfo {
-//
-//    private String mapUrl;
-//
-//    private String updateTime;
-//
-//    private String uploader;
-//
-//    private String name;
-//
-//    private String uuid;
-//
-//    private String site;
-//    /*
-//    0:草稿
-//    1：待审核
-//    2：通过
-//    3: 驳回
-//     */
-//    private String status;
-//
-//    //
-//    private int id;
-//
-//
-//    public String getMapUrl()
-//    {
-//        return mapUrl;
-//    }
-//
-//    public void setMapUrl(String mapUrl)
-//    {
-//        this.mapUrl = mapUrl;
-//    }
-//
-//    public String getUpdateTime()
-//    {
-//        return updateTime;
-//    }
-//
-//    public void setUpdateTime(String updateTime)
-//    {
-//        this.updateTime = updateTime;
-//    }
-//
-//    public String getUploader()
-//    {
-//        return uploader;
-//    }
-//
-//    public void setUploader(String uploader)
-//    {
-//        this.uploader = uploader;
-//    }
-//
-//    public String getName()
-//    {
-//        return name;
-//    }
-//
-//    public void setName(String name)
-//    {
-//        this.name = name;
-//    }
-//
-//    public String getUuid()
-//    {
-//        return uuid;
-//    }
-//
-//    public void setUuid(String uuid)
-//    {
-//        this.uuid = uuid;
-//    }
-//
-//    public String getSite()
-//    {
-//        return site;
-//    }
-//
-//    public void setSite(String site)
-//    {
-//        this.site = site;
-//    }
-//
-//    public String getStatus()
-//    {
-//        return status;
-//    }
-//
-//    public void setStatus(String status)
-//    {
-//        this.status = status;
-//    }
-//
-//    public int getId()
-//    {
-//        return id;
-//    }
-//
-//    public void setId(int id)
-//    {
-//        this.id = id;
-//    }
-//
-//    public static List<MapInfo> getMockerMaps()
-//    {
-//        List<MapInfo> maps = new ArrayList<MapInfo>();
-//        for (int i = 0; i < 20; i++)
-//        {
-//            MapInfo map = new MapInfo();
-//            map.setId(i);
-//            map.setUploader("张帆");
-//            map.setMapUrl("http://192.168.0.111:9080/accessControl/logo.jpg");
-//            map.setSite("永旺路"+i);
-//            map.setUpdateTime("2015-08-02");
-//            map.setStatus("待审核");
-//            maps.add(map);
-//        }
-//        return maps;
-//
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/rs/MarkResource.java b/src/main/java/com/casic/accessControl/rs/MarkResource.java
index 8ae4d85..cef1580 100644
--- a/src/main/java/com/casic/accessControl/rs/MarkResource.java
+++ b/src/main/java/com/casic/accessControl/rs/MarkResource.java
@@ -1,7 +1,7 @@
 package com.casic.accessControl.rs;
 
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
+//import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.manager.MarkerManager;
 import com.casic.accessControl.user.domain.Company;
@@ -35,8 +35,8 @@
     @Resource
     private MarkerManager markerManager;
 
-    @Resource
-    private FeatureManager featureManager;
+//    @Resource
+//    private FeatureManager featureManager;
 
     @GET
     @Path("post")
diff --git a/src/main/java/com/casic/accessControl/rs/UserObj.java b/src/main/java/com/casic/accessControl/rs/UserObj.java
deleted file mode 100644
index c0fe651..0000000
--- a/src/main/java/com/casic/accessControl/rs/UserObj.java
+++ /dev/null
@@ -1,61 +0,0 @@
-//package com.casic.accessControl.rs;
-//
-//import java.io.Serializable;
-//
-///**
-// * Created by admin on 2015/10/9.
-// */
-//public class UserObj implements Serializable {
-//    private String userName;
-//    private String password;
-//    private String appId;
-//    /*
-//    roles:��ɫ֮���Զ��ŷָ�
-//     */
-//    private String roles;
-//
-//    /*
-//    authorities:Ȩ��֮���Զ��ŷָ�
-//    */
-//    private String authorities;
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public String getPassword() {
-//        return password;
-//    }
-//
-//    public void setPassword(String password) {
-//        this.password = password;
-//    }
-//
-//    public String getAppId() {
-//        return appId;
-//    }
-//
-//    public void setAppId(String appId) {
-//        this.appId = appId;
-//    }
-//
-//    public String getRoles() {
-//        return roles;
-//    }
-//
-//    public void setRoles(String roles) {
-//        this.roles = roles;
-//    }
-//
-//    public String getAuthorities() {
-//        return authorities;
-//    }
-//
-//    public void setAuthorities(String authorities) {
-//        this.authorities = authorities;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java b/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java
deleted file mode 100644
index ac60ed5..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java
+++ /dev/null
@@ -1,65 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//import org.geotools.referencing.operation.transform.NADCONTransform;
-//
-//import javax.persistence.*;
-//
-///**
-// * Created by test203 on 2015/10/29.
-// */
-//@Entity
-//@Table(name = "ZX_DATABASE_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_DATABASE_INFO_ID", sequenceName = "SEQ_ZX_DATABASE_INFO_ID", allocationSize = 1, initialValue = 1)
-//public class DataBaseInfo {
-//    private Long id;
-//    private String account;
-//    private String password;
-//    private String sid;
-//    private String owner;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_ZX_DATABASE_INFO_ID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "ACCOUNT", nullable = false)
-//    public String getAccount() {
-//        return account;
-//    }
-//
-//    public void setAccount(String account) {
-//        this.account = account;
-//    }
-//
-//    @Column(name = "PASSWORD", nullable = false)
-//    public String getPassword() {
-//        return password;
-//    }
-//
-//    public void setPassword(String password) {
-//        this.password = password;
-//    }
-//
-//    @Column(name = "SID", nullable = false)
-//    public String getSid() {
-//        return sid;
-//    }
-//
-//    public void setSid(String sid) {
-//        this.sid = sid;
-//    }
-//
-//    @Column(name = "OWNER", nullable = false)
-//    public String getOwner() {
-//        return owner;
-//    }
-//
-//    public void setOwner(String owner) {
-//        this.owner = owner;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java b/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java
deleted file mode 100644
index 9578060..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java
+++ /dev/null
@@ -1,77 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//import com.casic.accessControl.org.domain.UserInfo;
-//
-//import javax.persistence.*;
-//import java.util.Date;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Entity
-//@Table(name = "ZX_ORCL_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_ORCL_INFO_ID",sequenceName = "SEQ_ZX_ORCL_INFO_ID",allocationSize = 1,initialValue = 1)
-//public class OrclInfo {
-//    private Long id;
-//    private String fileName;
-//    private String filePath;
-//    private String memo;
-//    private Date bkDay = new Date();
-//    private UserInfo userInfo;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE,generator = "SEQ_ZX_ORCL_INFO_ID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "FILE_NAME",nullable = false)
-//    public String getFileName() {
-//        return fileName;
-//    }
-//
-//    public void setFileName(String fileName) {
-//        this.fileName = fileName;
-//    }
-//
-//    @Column(name = "FILE_PATH",nullable = false)
-//    public String getFilePath() {
-//        return filePath;
-//    }
-//
-//    public void setFilePath(String filePath) {
-//        this.filePath = filePath;
-//    }
-//
-//    @Column(name = "MEMO")
-//    public String getMemo() {
-//        return memo;
-//    }
-//
-//    public void setMemo(String memo) {
-//        this.memo = memo;
-//    }
-//
-//    @Column(name = "BK_DAY")
-//    public Date getBkDay() {
-//        return bkDay;
-//    }
-//
-//    public void setBkDay(Date bkDay) {
-//        this.bkDay = bkDay;
-//    }
-//
-//    @ManyToOne(fetch = FetchType.LAZY)
-//    @JoinColumn(name = "USER_ID")
-//    public UserInfo getUserInfo() {
-//        return userInfo;
-//    }
-//
-//    public void setUserInfo(UserInfo userInfo) {
-//        this.userInfo = userInfo;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/SysLogInfo.java b/src/main/java/com/casic/accessControl/sys/domain/SysLogInfo.java
deleted file mode 100644
index 60e5583..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/SysLogInfo.java
+++ /dev/null
@@ -1,70 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//
-//import com.casic.accessControl.user.domain.UserInfo;
-//
-//import javax.persistence.*;
-//import java.io.Serializable;
-//import java.util.Date;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Entity
-//@Table(name = "ZX_SYS_LOG_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_SYS_LOG_ID",sequenceName = "SEQ_ZX_SYS_LOG_ID",allocationSize = 1,initialValue = 1)
-//public class SysLogInfo implements Serializable{
-//    private Long id;
-//    private String logType;//系统日志、运行日志、操作日志
-//    private String msg;
-//    private Date logDay = new Date();
-//    private UserInfo user;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE,generator = "SEQ_ZX_SYS_LOG_ID")
-//    @Column(name = "DBID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "LOG_TYPE",nullable = false)
-//    public String getLogType() {
-//        return logType;
-//    }
-//
-//    public void setLogType(String logType) {
-//        this.logType = logType;
-//    }
-//
-//    @Column(name = "LOG_MSG",nullable = false)
-//    public String getMsg() {
-//        return msg;
-//    }
-//
-//    public void setMsg(String msg) {
-//        this.msg = msg;
-//    }
-//
-//    @Column(name = "LOG_DAY")
-//    public Date getLogDay() {
-//        return logDay;
-//    }
-//
-//    public void setLogDay(Date logDay) {
-//        this.logDay = logDay;
-//    }
-//
-//    @ManyToOne(fetch = FetchType.LAZY)
-//    @JoinColumn(name = "USER_ID")
-//    public UserInfo getUser() {
-//        return user;
-//    }
-//
-//    public void setUser(UserInfo user) {
-//        this.user = user;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/dto/ExcelInfoDTO.java b/src/main/java/com/casic/accessControl/sys/dto/ExcelInfoDTO.java
deleted file mode 100644
index 2fe496e..0000000
--- a/src/main/java/com/casic/accessControl/sys/dto/ExcelInfoDTO.java
+++ /dev/null
@@ -1,77 +0,0 @@
-//package com.casic.accessControl.sys.dto;
-//
-//import com.casic.accessControl.sys.domain.SysLogInfo;
-//import com.casic.accessControl.util.DateUtils;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-///**
-// * Created by test203 on 2015/10/23.
-// */
-//public class ExcelInfoDTO {
-//    private String logType;//系统日志、运行日志、操作日志
-//    private String msg;
-//    private String logDay;
-//    private String userName;
-//
-//    public String getLogType() {
-//        return logType;
-//    }
-//
-//    public void setLogType(String logType) {
-//        this.logType = logType;
-//    }
-//
-//    public String getMsg() {
-//        return msg;
-//    }
-//
-//    public void setMsg(String msg) {
-//        this.msg = msg;
-//    }
-//
-//    public String getLogDay() {
-//        return logDay;
-//    }
-//
-//    public void setLogDay(String logDay) {
-//        this.logDay = logDay;
-//    }
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public static ExcelInfoDTO ConvertToDTO(SysLogInfo logInfo){
-//        if(null!=logInfo){
-//            ExcelInfoDTO dto = new ExcelInfoDTO();
-//            dto.setLogType(logInfo.getLogType());
-//            if(null!=logInfo.getLogDay()){
-//                dto.setLogDay(DateUtils.sdf2.format(logInfo.getLogDay()));
-//            }else {
-//                dto.setLogDay(" ");
-//            }
-//            dto.setMsg(logInfo.getMsg());
-//            if(null!=logInfo.getUser()){
-//                dto.setUserName(logInfo.getUser().getUserName());
-//            }else {
-//                dto.setUserName(" ");
-//            }
-//            return dto;
-//        }
-//        return new ExcelInfoDTO();
-//    }
-//
-//    public static List<ExcelInfoDTO> ConvertToDTO(List<SysLogInfo> list){
-//        List<ExcelInfoDTO> dtoList = new ArrayList<ExcelInfoDTO>();
-//        for(SysLogInfo log : list){
-//            dtoList.add(ConvertToDTO(log));
-//        }
-//        return dtoList;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/dto/OrclInfoDTO.java b/src/main/java/com/casic/accessControl/sys/dto/OrclInfoDTO.java
deleted file mode 100644
index 46a261d..0000000
--- a/src/main/java/com/casic/accessControl/sys/dto/OrclInfoDTO.java
+++ /dev/null
@@ -1,124 +0,0 @@
-//package com.casic.accessControl.sys.dto;
-//
-//import com.casic.accessControl.org.domain.UserInfo;
-//import com.casic.accessControl.shp.domain.LayerInfo;
-//import com.casic.accessControl.sys.domain.OrclInfo;
-//import com.casic.accessControl.util.DateUtils;
-//
-//import java.util.ArrayList;
-//import java.util.Date;
-//import java.util.List;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//public class OrclInfoDTO {
-//    private Long id;
-//    private String fileName;
-//    private String filePath;
-//    private String memo;
-//    private String bkDay;
-//    private Long userId;
-//    private String userName;
-//    private String btnRestor = "<a href='#' class='btn mini blue'>还原</a>";
-//    private String btnDelete = "<a href='#' class='btn mini red'>删除</a>";
-//
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    public String getFileName() {
-//        return fileName;
-//    }
-//
-//    public void setFileName(String fileName) {
-//        this.fileName = fileName;
-//    }
-//
-//    public String getFilePath() {
-//        return filePath;
-//    }
-//
-//    public void setFilePath(String filePath) {
-//        this.filePath = filePath;
-//    }
-//
-//    public String getMemo() {
-//        return memo;
-//    }
-//
-//    public void setMemo(String memo) {
-//        this.memo = memo;
-//    }
-//
-//    public String getBkDay() {
-//        return bkDay;
-//    }
-//
-//    public void setBkDay(String bkDay) {
-//        this.bkDay = bkDay;
-//    }
-//
-//    public Long getUserId() {
-//        return userId;
-//    }
-//
-//    public void setUserId(Long userId) {
-//        this.userId = userId;
-//    }
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public String getBtnRestor() {
-//        return btnRestor;
-//    }
-//
-//    public void setBtnRestor(String btnRestor) {
-//        this.btnRestor = btnRestor;
-//    }
-//
-//    public String getBtnDelete() {
-//        return btnDelete;
-//    }
-//
-//    public void setBtnDelete(String btnDelete) {
-//        this.btnDelete = btnDelete;
-//    }
-//
-//    public static OrclInfoDTO ConvertToDTO(OrclInfo orcl){
-//        if(null!=orcl){
-//            OrclInfoDTO dto = new OrclInfoDTO();
-//            dto.setId(orcl.getId());
-//            dto.setFileName(orcl.getFileName());
-//            dto.setFilePath(orcl.getFilePath());
-//            dto.setMemo(orcl.getMemo());
-//            if(null!=orcl.getBkDay()){
-//                dto.setBkDay(DateUtils.sdf1.format(orcl.getBkDay()));
-//            }
-//            if(null!=orcl.getUserInfo()){
-//                dto.setUserId(orcl.getUserInfo().getId());
-//                dto.setUserName(orcl.getUserInfo().getUsername());
-//            }
-//            return dto;
-//        }
-//        return new OrclInfoDTO();
-//    }
-//
-//    public static List<OrclInfoDTO> ConvertToDTO(List<OrclInfo> list){
-//        List<OrclInfoDTO> dtoList = new ArrayList<OrclInfoDTO>();
-//        for(OrclInfo orcl : list){
-//            dtoList.add(ConvertToDTO(orcl));
-//        }
-//        return dtoList;
-//    }
-//}

diff --git a/src/main/java/com/casic/accessControl/feature/domain/Feature.java b/src/main/java/com/casic/accessControl/feature/domain/Feature.java
deleted file mode 100644
index c89a0c2..0000000
--- a/src/main/java/com/casic/accessControl/feature/domain/Feature.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.casic.accessControl.feature.domain;
-
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-
-import javax.persistence.*;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-//点的信息
-@Entity
-@Table(name = "feature")
-public class Feature {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private Long id;
-    @Column(name = "longitude")
-    private Double longitude;
-    @Column(name = "latitude")
-    private Double latitude;
-    @Column(name = "featureName")
-    private String featureName;
-    @Column(name = "type")
-    private int type;
-    @Column(name = "isValid")
-    private Integer isValid;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "parent")
-    private Feature parent;
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "parent")
-    private List<Feature> children;
-    @Column(name = "memo")
-    private String memo;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "owner", referencedColumnName = "id")
-    private User owner;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "company", referencedColumnName = "id")
-    private Company company;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer isValid() {
-        return isValid;
-    }
-
-    public void setValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public Feature getParent() {
-        return parent;
-    }
-
-    public void setParent(Feature parent) {
-        this.parent = parent;
-    }
-
-    public List<Feature> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<Feature> children) {
-        this.children = children;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public User getOwner() {
-        return owner;
-    }
-
-    public void setOwner(User owner) {
-        this.owner = owner;
-    }
-
-    public Company getCompany() {
-        return company;
-    }
-
-    public void setCompany(Company company) {
-        this.company = company;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java b/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
deleted file mode 100644
index 256f261..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import com.casic.accessControl.feature.domain.Feature;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/17.
- */
-public class FeatureDto {
-    private Long id;
-    private Double longitude;
-    private Double latitude;
-    private String featureName;
-    private int type;
-    private Integer isValid;
-    private String memo;
-    private Long parentId;
-
-    private String btnEdit = "<a href='#' class='btn mini blue'><i class='icon-edit'></i>编辑</a>";
-    private String btnDelete = "<a href='#' class='btn mini red'><i class='icon-trash'></i>删除</a>";
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer getIsValid() {
-        return isValid;
-    }
-
-    public void setIsValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public Long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getBtnEdit() {
-        return btnEdit;
-    }
-
-    public void setBtnEdit(String btnEdit) {
-        this.btnEdit = btnEdit;
-    }
-
-    public String getBtnDelete() {
-        return btnDelete;
-    }
-
-    public void setBtnDelete(String btnDelete) {
-        this.btnDelete = btnDelete;
-    }
-
-    public static FeatureDto convert2FeatureDto(Feature feature) {
-        if (feature == null) {
-            return null;
-        }
-        FeatureDto featureDto = new FeatureDto();
-        featureDto.setId(feature.getId());
-        featureDto.setFeatureName(feature.getFeatureName());
-        featureDto.setIsValid(feature.isValid());
-        featureDto.setLatitude(feature.getLatitude());
-        featureDto.setLongitude(feature.getLongitude());
-        featureDto.setMemo(feature.getMemo());
-        featureDto.setType(feature.getType());
-        if (feature.getParent() != null)
-            featureDto.setParentId(feature.getParent().getId());
-        return featureDto;
-    }
-
-    public static List<FeatureDto> convert2FeatureDtos(List<Feature> features) {
-        List<FeatureDto> featureDtos = new ArrayList<FeatureDto>();
-        for (Feature feature : features) {
-            featureDtos.add(convert2FeatureDto(feature));
-        }
-        return featureDtos;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java b/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
deleted file mode 100644
index 785dcba..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/19.
- */
-public class OrgDto {
-    private long id;
-
-    private String name;
-
-    private long parentId;
-
-    private List<OrgDto> children = new ArrayList<OrgDto>();
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(long parentId) {
-        this.parentId = parentId;
-    }
-
-    public List<OrgDto> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<OrgDto> children) {
-        this.children = children;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java b/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
deleted file mode 100644
index a475e21..0000000
--- a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
+++ /dev/null
@@ -1,316 +0,0 @@
-package com.casic.accessControl.feature.manager;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.core.page.Page;
-import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.marker.manager.MarkerManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.DataTableParameter;
-import com.casic.accessControl.util.DataTableUtils;
-import org.apache.commons.collections.CollectionUtils;
-import org.hibernate.Criteria;
-import org.hibernate.Query;
-import org.hibernate.criterion.Restrictions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.jdbc.object.SqlQuery;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-@Service
-public class FeatureManager extends HibernateEntityDao<Feature> {
-
-    private Logger logger = LoggerFactory.getLogger(this.getClass());
-    @Resource
-    private MarkerManager markerManager;
-
-
-    public Feature getFeatureById(Long id) {
-        Feature feature = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("id", id)).add(Restrictions.eq("isValid", 1));
-            feature = (Feature) criteria.list().get(0);
-        } catch (Exception e) {
-            return null;
-        }
-        return feature;
-    }
-
-    public FeatureDto getFeatureDtoById(Long id) {
-        return FeatureDto.convert2FeatureDto(getFeatureById(id));
-    }
-
-    /**
-     * 根据id，软删除某个点或线或片
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param ids 多个id
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public String invalidFeature(String ids) {
-        if (StringUtils.isBlank(ids) || ids.indexOf(")") != -1) {//未传入值，直接返回，防止无效查询,过滤非法请求，防止sql注入
-            return "";
-        }
-        String[] idsArr = ids.split(",");
-        StringBuilder canDeleteIds = new StringBuilder("");
-        StringBuilder cantDeleleIds = new StringBuilder("");
-        //找出能删除的和不能删除的id组合
-        for (String id : idsArr) {
-            Long longId = Long.valueOf(id);
-            if (this.isCanDelete(longId)) {
-                if (canDeleteIds.length() > 0) {
-                    canDeleteIds.append(",");
-                }
-                canDeleteIds.append(id);
-
-            } else {
-                if (cantDeleleIds.length() > 0) {
-                    cantDeleleIds.append(",");
-                }
-                cantDeleleIds.append(id);
-            }
-        }
-
-        String temp1Ids = canDeleteIds.toString();
-        String temp2Ids = cantDeleleIds.toString();
-        if (StringUtils.isNotBlank(temp2Ids)) {//有不能删除的，都不删除
-            return "";
-        }
-        Query query = this.getSession().createQuery("update Feature f set f.isValid = 0 where id in (" + temp1Ids + ")");
-        query.executeUpdate();
-
-        return "success";
-    }
-
-    /**
-     * 判断feature是否可以删除
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param id
-     * @return
-     */
-    private boolean isCanDelete(Long id) {
-        Feature feature = this.getFeatureById(id);
-        if (feature.getParent() == null) {//所有用户共用的根节点不能删除
-            return false;
-        }
-        if (CollectionUtils.isNotEmpty(feature.getChildren())) {
-            for (Feature child : feature.getChildren()) {
-                if (child.isValid() == 1) {
-                    return false;
-                }
-            }
-
-        }
-        List<Marker> markers = markerManager.getMarkerByFeature(feature);
-        if (CollectionUtils.isNotEmpty(markers)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * 将数据库中的feature信息按照参数更新
-     *
-     * @param feature
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public void saveOrupdateFeature(Feature feature, User user) {
-        this.getSession().saveOrUpdate(feature);
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param user 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByUser")
-    public List<FeatureDto> getFeaturesByUser(Integer type, User user) {
-        if (user == null) {
-            return Collections.emptyList();
-        }
-        Company company = user.getCompany();
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("type", type));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-        return FeatureDto.convert2FeatureDtos(features);
-    }
-
-    /**
-     * 分页使用，datatable获取相应type的feature某页数据
-     *
-     * @param params
-     * @param user
-     * @return
-     */
-    public DataTable<FeatureDto> getPageFeatureListByTye(String params, Feature parent, User user) {
-        DataTable<FeatureDto> result = new DataTable<FeatureDto>();
-        DataTableParameter parameter = DataTableUtils.getDataTableParameterByJsonParam(params);
-        int start = parameter.getiDisplayStart();
-        int pageSize = parameter.getiDisplayLength();
-        int pageNo = (start / pageSize) + 1;
-        Criteria criteria = this.createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        Company company = user.getCompany();
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("isValid", 1)).add(Restrictions.eq("parent", parent));
-        Page page = pagedQuery(criteria, pageNo, pageSize);
-        List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos((List<Feature>) page.getResult());
-        result.setAaData(featureDtos);
-        result.setiTotalDisplayRecords((int) page.getTotalCount());
-        result.setiTotalRecords((int) page.getTotalCount());
-        result.setsEcho(parameter.getsEcho());
-        return result;
-
-
-    }
-
-    /**
-     * 获取层次结构列表,增加缓存
-     *
-     * @param type
-     * @param company
-     * @return
-     */
-    @Cacheable(value = "getOrgList")
-    public String getOrgList(Integer type, Company company) {
-        List<OrgDto> orgDtos = new ArrayList<OrgDto>();
-        List<Feature> features = this.getRootFeatures(type);
-        for (Feature feature : features) {
-            orgDtos.add(this.getChildrenByParentId(feature.getId(), company));
-        }
-        String jsonStr = null;
-        try {
-            jsonStr = new JsonMapper().toJson(orgDtos);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return jsonStr;
-    }
-
-    //    @Cacheable(value = "getChildrenByParentId", key = "#id")
-    public OrgDto getChildrenByParentId(Long id, Company company) {
-        if (id == null) {
-            return null;
-        }
-        Feature feature = getFeatureById(id);
-        if (feature == null) {
-            return null;
-        }
-        //创建OrgDto节点
-        OrgDto orgDto = new OrgDto();
-        orgDto.setId(id); //保存ID信息
-        orgDto.setName(feature.getFeatureName());
-        if (feature.getParent() != null) {
-            orgDto.setParentId(feature.getParent().getId());
-        }
-        List<Feature> departments = this.getActiveChildrenOrgs(feature, company);
-        for (Feature fea : departments) {
-            orgDto.getChildren().add(this.getChildrenByParentId(fea.getId(), company));
-        }
-        return orgDto;
-    }
-
-    //    @Cacheable(value = "getActiveChildrenOrgs", key = "#department.getId()")
-    private List<Feature> getActiveChildrenOrgs(Feature department, Company company) {
-        List<Feature> features = new ArrayList<Feature>();
-        for (Feature feature : department.getChildren()) {
-            if (feature.isValid() == 1 && feature.getCompany().getId().equals(company.getId())) {
-                features.add(feature);
-            }
-        }
-        return features;
-    }
-
-
-    public List<Feature> getRootFeatures(Integer type) {
-        List<Feature> features = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("type", type)).add(Restrictions.isNull("parent"));
-            features = criteria.list();
-        } catch (Exception e) {
-            return Collections.emptyList();
-        }
-        return features;
-
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param company 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByCompany", key = "#company.getId()")
-    public List<Feature> getFeaturesByCompany(Company company) {
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-        criteria.add(Restrictions.eq("company", company));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-
-        for (Feature f : features) {
-            f.getChildren().toString();
-            f.getOwner().toString();
-            if (f.getParent() != null)
-                f.getParent().toString();
-        }
-        return features;
-    }
-
-    /**
-     * 根据组织结构的id获取叶子节点
-     ***重要：**已更改为包含本节点****
-     * @param type
-     * @param feature
-     * @return
-     */
-    public List<Feature> getLeafByParentId(Integer type, Feature feature) {
-        if (feature == null || feature.isValid() == 0) return Collections.emptyList();
-        List<Feature> features = new ArrayList<Feature>();
-        if (CollectionUtils.isEmpty(feature.getChildren())) {
-            features.add(feature);
-            return features;
-        }
-        List<Feature> children = feature.getChildren();
-        boolean flag = false;
-        for (Feature child : children) {
-            if (child.isValid() == 1) {
-                flag = true;
-                features.addAll(getLeafByParentId(type, child));
-            }
-        }
-//        if (!flag) {//没有有效的子节点
-            features.add(feature);
-//        }
-        return features;
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java b/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
deleted file mode 100644
index a706a36..0000000
--- a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package com.casic.accessControl.feature.web;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.Role;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.CompanyManager;
-import com.casic.accessControl.user.manager.UserManager;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.StringUtils;
-import com.casic.accessControl.xls.Common;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import sun.org.mozilla.javascript.internal.EcmaError;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.IOException;
-import java.util.*;
-
-/**
- * 提供http访问接口
- * Created by lenovo on 2016/5/16.
- */
-@Controller
-@RequestMapping(value = "feature")
-public class FeatureController {
-    @Autowired
-    private FeatureManager featureManager;
-    @Autowired
-    private UserManager userManager;
-    @Autowired
-    private CompanyManager companyManager;
-
-    @RequestMapping(value = "org-list")
-    @ResponseBody
-    public String getOrgList(@RequestParam(required = true) Integer type, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Company company = user.getCompany();
-        return featureManager.getOrgList(type, company);
-    }
-
-    @RequestMapping(value = "org-list-na")
-    @ResponseBody
-    public Map<String, String> getOrgListNa(@RequestParam Long userId) {//na端所有传过来的userid都是公司id
-        Map<String, String> res = new HashMap<String, String>();
-        res.put("message", "列表获取失败");
-        try {
-//            User user = userManager.getUserById(userId);//获取当前登录用户
-//            Company company = user.getCompany();
-            Company company = companyManager.getCompanyById(userId);
-            String areas = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.AREA.getIndex(), company);
-            String lines = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.LINE.getIndex(), company);
-            res.put("feature", areas);
-            res.put("line", lines);
-        } catch (Exception e) {
-            return res;
-        }
-        res.put("message", "成功获取");
-        return res;
-    }
-
-    @RequestMapping(value = "getFeature")
-    @ResponseBody
-    public Map<String, Object> getFeaturesByUser(@RequestParam(required = true) Integer type, HttpSession session) {
-
-        Map<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        List<FeatureDto> list = featureManager.getFeaturesByUser(type, user);
-        if (list == null) {//获取列表失败
-            result.put("message", "获取列表出现错误");
-            return result;
-        } else {
-            result.put("data", list);
-            result.put("message", "获取列表成功");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "getSubFeatureList")
-    public void getSubFeatureList(@RequestParam(required = true) String jsonParams, @RequestParam(required = false) Long parentId, HttpServletResponse response, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Feature parent = featureManager.getFeatureById(parentId);
-        DataTable<FeatureDto> dtoDataTable = featureManager.getPageFeatureListByTye(jsonParams, parent, user);
-        Gson gson = new Gson();
-        String json = gson.toJson(dtoDataTable);
-        response.setCharacterEncoding("utf-8");
-        try {
-            response.getWriter().write(json);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @RequestMapping(value = "delete")
-    @ResponseBody
-    public Map<String, Object> deleteFeatureById(@RequestParam(required = true) Long id, HttpSession session) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        try {
-            String res = featureManager.invalidFeature(id.toString());
-            if (StringUtils.isBlank(res)) {
-                result.put("message", "删除失败");
-            } else {
-                result.put("message", "删除成功");
-                result.put("success", true);
-            }
-        } catch (Exception e) {
-            result.put("message", "删除失败");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "save")
-    @ResponseBody
-    public Map<String, Object> save(@RequestParam(required = true) String params, HttpSession session) {
-        Gson gson = new Gson();
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        Map markers = gson.fromJson(params, HashMap.class);
-        String featureName = (String) markers.get("featureName");
-        String memo = (String) markers.get("memo") == null ? "" : (String) markers.get("memo");
-        Long parentId = Long.valueOf(StringUtils.isBlank((String) markers.get("parentId")) ? "-1" : (String) markers.get("parentId"));//不知为什么转过来为Double
-        Long id = Long.valueOf(StringUtils.isBlank((String) markers.get("id")) ? "-1" : (String) markers.get("id"));
-
-
-        if (StringUtils.isBlank(featureName) || parentId.equals(-1L)) {
-            result.put("message", "必要参数未传送");
-            return result;
-        }
-        Feature feature = new Feature();
-        feature.setValid(1);
-        Feature parent = featureManager.getFeatureById(parentId);
-        feature.setParent(parent);
-        feature.setFeatureName(featureName);
-        feature.setMemo(memo);
-        feature.setOwner(user);
-        feature.setCompany(user.getCompany());
-        feature.setType(parent.getType());
-        if (!id.equals(-1L)) {
-            feature.setId(id);
-        }
-        try {
-            featureManager.saveOrupdateFeature(feature, user);
-            result.put("message", "保存成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "保存失败");
-        }
-        return result;
-
-    }
-
-
-    @RequestMapping(value = "getFeatureById")
-    @ResponseBody
-    public Map<String, Object> getFeatureById(@RequestParam(required = true) Long id) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        try {
-            FeatureDto feature = featureManager.getFeatureDtoById(id);
-            result.put("data", feature);
-            result.put("message", "获取成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "获取失败");
-        }
-        return result;
-
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
index 08a290e..3f53635 100644
--- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
+++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
@@ -1,6 +1,6 @@
 package com.casic.accessControl.marker.dto;
 
-import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.domain.Feature;
 import com.casic.accessControl.marker.domain.Marker;
 import org.apache.commons.collections.CollectionUtils;
 
diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
index 080b291..7fe7434 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -4,8 +4,6 @@
 import com.casic.accessControl.core.hibernate.HibernateEntityDao;
 import com.casic.accessControl.core.page.Page;
 import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.user.domain.Company;
@@ -49,9 +47,6 @@
 public class MarkerManager extends HibernateEntityDao<Marker> {
 
     @Resource
-    private FeatureManager featureManager;
-
-    @Resource
     private UserManager userInfoManager;
 
 
@@ -154,33 +149,33 @@
 
     //获取marker
 //    @Cacheable(value = "getMarkerByFeature", key = "#feature.getId()")
-    public List<Marker> getMarkerByFeature(Feature feature) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            criteria.add(Restrictions.eq("belongLine", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            criteria.add(Restrictions.eq("belongLine", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
-    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
-            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
+//            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
     public boolean saveMarker(Marker marker) {
         try {
@@ -465,7 +460,7 @@
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setLayStyle(sheet.getCell(indexMap.get("layStyle"), i).getContents());
-                } else if(recordTypeFlag == 4) {
+                } else if (recordTypeFlag == 4) {
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setBelowType(sheet.getCell(indexMap.get("belowType"), i).getContents());
diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
index a19f2f5..7675e1f 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -2,9 +2,6 @@
 
 import com.casic.accessControl.core.ext.export.CsvExportor;
 import com.casic.accessControl.core.ext.export.TableModel;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.manager.MarkerManager;
diff --git a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java b/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
deleted file mode 100644
index e69de29..0000000
--- a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
+++ /dev/null
diff --git a/src/main/java/com/casic/accessControl/rs/FeatureResource.java b/src/main/java/com/casic/accessControl/rs/FeatureResource.java
index 68aeb97..e97f18b 100644
--- a/src/main/java/com/casic/accessControl/rs/FeatureResource.java
+++ b/src/main/java/com/casic/accessControl/rs/FeatureResource.java
@@ -1,65 +1,65 @@
-package com.casic.accessControl.rs;
-
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.UserManager;
-import com.google.gson.Gson;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import javax.annotation.Resource;
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
-* Created by admin on 2015/1/15.
-*/
-@Component
-@Path("feature")
-public class FeatureResource
-{
-    private static Logger logger = LoggerFactory.getLogger(FeatureResource.class);
-
-    @Resource
-    private UserManager userManager;
-
-    @Resource
-    private FeatureManager featureManager;
-
-    @GET
-    @Path("get")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map get(@QueryParam("userName") String userName ){
-        Map map = new HashMap<String, Object>();
-        try {
-            User user = userManager.getUserByName(userName);
-            if (user == null) {
-                map.put("success", "false");
-                map.put("message", "人员不存在！");
-                return map;
-            }
-            Company company = user.getCompany();
-            if (company!=null)
-            {
-                List<Feature> features = featureManager.getFeaturesByCompany(company);
-                List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos(features);
-                map.put("success", "true");
-                map.put("message", featureDtos);
-            }
-        }
-        catch (Exception e)
-        {
-            map.put("success", "false");
-            map.put("message", e.getMessage());
-        }
-        return  map;
-    }
-}
+//package com.casic.accessControl.rs;
+//
+//import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.dto.FeatureDto;
+//import com.casic.accessControl.feature.manager.FeatureManager;
+//import com.casic.accessControl.user.domain.Company;
+//import com.casic.accessControl.user.domain.User;
+//import com.casic.accessControl.user.manager.UserManager;
+//import com.google.gson.Gson;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.stereotype.Component;
+//import org.springframework.web.bind.annotation.RequestParam;
+//
+//import javax.annotation.Resource;
+//import javax.ws.rs.*;
+//import javax.ws.rs.core.MediaType;
+//import java.util.HashMap;
+//import java.util.List;
+//import java.util.Map;
+//
+///**
+//* Created by admin on 2015/1/15.
+//*/
+//@Component
+//@Path("feature")
+//public class FeatureResource
+//{
+//    private static Logger logger = LoggerFactory.getLogger(FeatureResource.class);
+//
+//    @Resource
+//    private UserManager userManager;
+//
+//    @Resource
+//    private FeatureManager featureManager;
+//
+//    @GET
+//    @Path("get")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public Map get(@QueryParam("userName") String userName ){
+//        Map map = new HashMap<String, Object>();
+//        try {
+//            User user = userManager.getUserByName(userName);
+//            if (user == null) {
+//                map.put("success", "false");
+//                map.put("message", "人员不存在！");
+//                return map;
+//            }
+//            Company company = user.getCompany();
+//            if (company!=null)
+//            {
+//                List<Feature> features = featureManager.getFeaturesByCompany(company);
+//                List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos(features);
+//                map.put("success", "true");
+//                map.put("message", featureDtos);
+//            }
+//        }
+//        catch (Exception e)
+//        {
+//            map.put("success", "false");
+//            map.put("message", e.getMessage());
+//        }
+//        return  map;
+//    }
+//}
diff --git a/src/main/java/com/casic/accessControl/rs/MapInfo.java b/src/main/java/com/casic/accessControl/rs/MapInfo.java
deleted file mode 100644
index a77fce9..0000000
--- a/src/main/java/com/casic/accessControl/rs/MapInfo.java
+++ /dev/null
@@ -1,131 +0,0 @@
-//package com.casic.accessControl.rs;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-///**
-// * Created by admin on 2015/8/26.
-// */
-//public class MapInfo {
-//
-//    private String mapUrl;
-//
-//    private String updateTime;
-//
-//    private String uploader;
-//
-//    private String name;
-//
-//    private String uuid;
-//
-//    private String site;
-//    /*
-//    0:草稿
-//    1：待审核
-//    2：通过
-//    3: 驳回
-//     */
-//    private String status;
-//
-//    //
-//    private int id;
-//
-//
-//    public String getMapUrl()
-//    {
-//        return mapUrl;
-//    }
-//
-//    public void setMapUrl(String mapUrl)
-//    {
-//        this.mapUrl = mapUrl;
-//    }
-//
-//    public String getUpdateTime()
-//    {
-//        return updateTime;
-//    }
-//
-//    public void setUpdateTime(String updateTime)
-//    {
-//        this.updateTime = updateTime;
-//    }
-//
-//    public String getUploader()
-//    {
-//        return uploader;
-//    }
-//
-//    public void setUploader(String uploader)
-//    {
-//        this.uploader = uploader;
-//    }
-//
-//    public String getName()
-//    {
-//        return name;
-//    }
-//
-//    public void setName(String name)
-//    {
-//        this.name = name;
-//    }
-//
-//    public String getUuid()
-//    {
-//        return uuid;
-//    }
-//
-//    public void setUuid(String uuid)
-//    {
-//        this.uuid = uuid;
-//    }
-//
-//    public String getSite()
-//    {
-//        return site;
-//    }
-//
-//    public void setSite(String site)
-//    {
-//        this.site = site;
-//    }
-//
-//    public String getStatus()
-//    {
-//        return status;
-//    }
-//
-//    public void setStatus(String status)
-//    {
-//        this.status = status;
-//    }
-//
-//    public int getId()
-//    {
-//        return id;
-//    }
-//
-//    public void setId(int id)
-//    {
-//        this.id = id;
-//    }
-//
-//    public static List<MapInfo> getMockerMaps()
-//    {
-//        List<MapInfo> maps = new ArrayList<MapInfo>();
-//        for (int i = 0; i < 20; i++)
-//        {
-//            MapInfo map = new MapInfo();
-//            map.setId(i);
-//            map.setUploader("张帆");
-//            map.setMapUrl("http://192.168.0.111:9080/accessControl/logo.jpg");
-//            map.setSite("永旺路"+i);
-//            map.setUpdateTime("2015-08-02");
-//            map.setStatus("待审核");
-//            maps.add(map);
-//        }
-//        return maps;
-//
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/rs/MarkResource.java b/src/main/java/com/casic/accessControl/rs/MarkResource.java
index 8ae4d85..cef1580 100644
--- a/src/main/java/com/casic/accessControl/rs/MarkResource.java
+++ b/src/main/java/com/casic/accessControl/rs/MarkResource.java
@@ -1,7 +1,7 @@
 package com.casic.accessControl.rs;
 
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
+//import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.manager.MarkerManager;
 import com.casic.accessControl.user.domain.Company;
@@ -35,8 +35,8 @@
     @Resource
     private MarkerManager markerManager;
 
-    @Resource
-    private FeatureManager featureManager;
+//    @Resource
+//    private FeatureManager featureManager;
 
     @GET
     @Path("post")
diff --git a/src/main/java/com/casic/accessControl/rs/UserObj.java b/src/main/java/com/casic/accessControl/rs/UserObj.java
deleted file mode 100644
index c0fe651..0000000
--- a/src/main/java/com/casic/accessControl/rs/UserObj.java
+++ /dev/null
@@ -1,61 +0,0 @@
-//package com.casic.accessControl.rs;
-//
-//import java.io.Serializable;
-//
-///**
-// * Created by admin on 2015/10/9.
-// */
-//public class UserObj implements Serializable {
-//    private String userName;
-//    private String password;
-//    private String appId;
-//    /*
-//    roles:��ɫ֮���Զ��ŷָ�
-//     */
-//    private String roles;
-//
-//    /*
-//    authorities:Ȩ��֮���Զ��ŷָ�
-//    */
-//    private String authorities;
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public String getPassword() {
-//        return password;
-//    }
-//
-//    public void setPassword(String password) {
-//        this.password = password;
-//    }
-//
-//    public String getAppId() {
-//        return appId;
-//    }
-//
-//    public void setAppId(String appId) {
-//        this.appId = appId;
-//    }
-//
-//    public String getRoles() {
-//        return roles;
-//    }
-//
-//    public void setRoles(String roles) {
-//        this.roles = roles;
-//    }
-//
-//    public String getAuthorities() {
-//        return authorities;
-//    }
-//
-//    public void setAuthorities(String authorities) {
-//        this.authorities = authorities;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java b/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java
deleted file mode 100644
index ac60ed5..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java
+++ /dev/null
@@ -1,65 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//import org.geotools.referencing.operation.transform.NADCONTransform;
-//
-//import javax.persistence.*;
-//
-///**
-// * Created by test203 on 2015/10/29.
-// */
-//@Entity
-//@Table(name = "ZX_DATABASE_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_DATABASE_INFO_ID", sequenceName = "SEQ_ZX_DATABASE_INFO_ID", allocationSize = 1, initialValue = 1)
-//public class DataBaseInfo {
-//    private Long id;
-//    private String account;
-//    private String password;
-//    private String sid;
-//    private String owner;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_ZX_DATABASE_INFO_ID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "ACCOUNT", nullable = false)
-//    public String getAccount() {
-//        return account;
-//    }
-//
-//    public void setAccount(String account) {
-//        this.account = account;
-//    }
-//
-//    @Column(name = "PASSWORD", nullable = false)
-//    public String getPassword() {
-//        return password;
-//    }
-//
-//    public void setPassword(String password) {
-//        this.password = password;
-//    }
-//
-//    @Column(name = "SID", nullable = false)
-//    public String getSid() {
-//        return sid;
-//    }
-//
-//    public void setSid(String sid) {
-//        this.sid = sid;
-//    }
-//
-//    @Column(name = "OWNER", nullable = false)
-//    public String getOwner() {
-//        return owner;
-//    }
-//
-//    public void setOwner(String owner) {
-//        this.owner = owner;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java b/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java
deleted file mode 100644
index 9578060..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java
+++ /dev/null
@@ -1,77 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//import com.casic.accessControl.org.domain.UserInfo;
-//
-//import javax.persistence.*;
-//import java.util.Date;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Entity
-//@Table(name = "ZX_ORCL_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_ORCL_INFO_ID",sequenceName = "SEQ_ZX_ORCL_INFO_ID",allocationSize = 1,initialValue = 1)
-//public class OrclInfo {
-//    private Long id;
-//    private String fileName;
-//    private String filePath;
-//    private String memo;
-//    private Date bkDay = new Date();
-//    private UserInfo userInfo;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE,generator = "SEQ_ZX_ORCL_INFO_ID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "FILE_NAME",nullable = false)
-//    public String getFileName() {
-//        return fileName;
-//    }
-//
-//    public void setFileName(String fileName) {
-//        this.fileName = fileName;
-//    }
-//
-//    @Column(name = "FILE_PATH",nullable = false)
-//    public String getFilePath() {
-//        return filePath;
-//    }
-//
-//    public void setFilePath(String filePath) {
-//        this.filePath = filePath;
-//    }
-//
-//    @Column(name = "MEMO")
-//    public String getMemo() {
-//        return memo;
-//    }
-//
-//    public void setMemo(String memo) {
-//        this.memo = memo;
-//    }
-//
-//    @Column(name = "BK_DAY")
-//    public Date getBkDay() {
-//        return bkDay;
-//    }
-//
-//    public void setBkDay(Date bkDay) {
-//        this.bkDay = bkDay;
-//    }
-//
-//    @ManyToOne(fetch = FetchType.LAZY)
-//    @JoinColumn(name = "USER_ID")
-//    public UserInfo getUserInfo() {
-//        return userInfo;
-//    }
-//
-//    public void setUserInfo(UserInfo userInfo) {
-//        this.userInfo = userInfo;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/SysLogInfo.java b/src/main/java/com/casic/accessControl/sys/domain/SysLogInfo.java
deleted file mode 100644
index 60e5583..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/SysLogInfo.java
+++ /dev/null
@@ -1,70 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//
-//import com.casic.accessControl.user.domain.UserInfo;
-//
-//import javax.persistence.*;
-//import java.io.Serializable;
-//import java.util.Date;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Entity
-//@Table(name = "ZX_SYS_LOG_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_SYS_LOG_ID",sequenceName = "SEQ_ZX_SYS_LOG_ID",allocationSize = 1,initialValue = 1)
-//public class SysLogInfo implements Serializable{
-//    private Long id;
-//    private String logType;//系统日志、运行日志、操作日志
-//    private String msg;
-//    private Date logDay = new Date();
-//    private UserInfo user;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE,generator = "SEQ_ZX_SYS_LOG_ID")
-//    @Column(name = "DBID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "LOG_TYPE",nullable = false)
-//    public String getLogType() {
-//        return logType;
-//    }
-//
-//    public void setLogType(String logType) {
-//        this.logType = logType;
-//    }
-//
-//    @Column(name = "LOG_MSG",nullable = false)
-//    public String getMsg() {
-//        return msg;
-//    }
-//
-//    public void setMsg(String msg) {
-//        this.msg = msg;
-//    }
-//
-//    @Column(name = "LOG_DAY")
-//    public Date getLogDay() {
-//        return logDay;
-//    }
-//
-//    public void setLogDay(Date logDay) {
-//        this.logDay = logDay;
-//    }
-//
-//    @ManyToOne(fetch = FetchType.LAZY)
-//    @JoinColumn(name = "USER_ID")
-//    public UserInfo getUser() {
-//        return user;
-//    }
-//
-//    public void setUser(UserInfo user) {
-//        this.user = user;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/dto/ExcelInfoDTO.java b/src/main/java/com/casic/accessControl/sys/dto/ExcelInfoDTO.java
deleted file mode 100644
index 2fe496e..0000000
--- a/src/main/java/com/casic/accessControl/sys/dto/ExcelInfoDTO.java
+++ /dev/null
@@ -1,77 +0,0 @@
-//package com.casic.accessControl.sys.dto;
-//
-//import com.casic.accessControl.sys.domain.SysLogInfo;
-//import com.casic.accessControl.util.DateUtils;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-///**
-// * Created by test203 on 2015/10/23.
-// */
-//public class ExcelInfoDTO {
-//    private String logType;//系统日志、运行日志、操作日志
-//    private String msg;
-//    private String logDay;
-//    private String userName;
-//
-//    public String getLogType() {
-//        return logType;
-//    }
-//
-//    public void setLogType(String logType) {
-//        this.logType = logType;
-//    }
-//
-//    public String getMsg() {
-//        return msg;
-//    }
-//
-//    public void setMsg(String msg) {
-//        this.msg = msg;
-//    }
-//
-//    public String getLogDay() {
-//        return logDay;
-//    }
-//
-//    public void setLogDay(String logDay) {
-//        this.logDay = logDay;
-//    }
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public static ExcelInfoDTO ConvertToDTO(SysLogInfo logInfo){
-//        if(null!=logInfo){
-//            ExcelInfoDTO dto = new ExcelInfoDTO();
-//            dto.setLogType(logInfo.getLogType());
-//            if(null!=logInfo.getLogDay()){
-//                dto.setLogDay(DateUtils.sdf2.format(logInfo.getLogDay()));
-//            }else {
-//                dto.setLogDay(" ");
-//            }
-//            dto.setMsg(logInfo.getMsg());
-//            if(null!=logInfo.getUser()){
-//                dto.setUserName(logInfo.getUser().getUserName());
-//            }else {
-//                dto.setUserName(" ");
-//            }
-//            return dto;
-//        }
-//        return new ExcelInfoDTO();
-//    }
-//
-//    public static List<ExcelInfoDTO> ConvertToDTO(List<SysLogInfo> list){
-//        List<ExcelInfoDTO> dtoList = new ArrayList<ExcelInfoDTO>();
-//        for(SysLogInfo log : list){
-//            dtoList.add(ConvertToDTO(log));
-//        }
-//        return dtoList;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/dto/OrclInfoDTO.java b/src/main/java/com/casic/accessControl/sys/dto/OrclInfoDTO.java
deleted file mode 100644
index 46a261d..0000000
--- a/src/main/java/com/casic/accessControl/sys/dto/OrclInfoDTO.java
+++ /dev/null
@@ -1,124 +0,0 @@
-//package com.casic.accessControl.sys.dto;
-//
-//import com.casic.accessControl.org.domain.UserInfo;
-//import com.casic.accessControl.shp.domain.LayerInfo;
-//import com.casic.accessControl.sys.domain.OrclInfo;
-//import com.casic.accessControl.util.DateUtils;
-//
-//import java.util.ArrayList;
-//import java.util.Date;
-//import java.util.List;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//public class OrclInfoDTO {
-//    private Long id;
-//    private String fileName;
-//    private String filePath;
-//    private String memo;
-//    private String bkDay;
-//    private Long userId;
-//    private String userName;
-//    private String btnRestor = "<a href='#' class='btn mini blue'>还原</a>";
-//    private String btnDelete = "<a href='#' class='btn mini red'>删除</a>";
-//
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    public String getFileName() {
-//        return fileName;
-//    }
-//
-//    public void setFileName(String fileName) {
-//        this.fileName = fileName;
-//    }
-//
-//    public String getFilePath() {
-//        return filePath;
-//    }
-//
-//    public void setFilePath(String filePath) {
-//        this.filePath = filePath;
-//    }
-//
-//    public String getMemo() {
-//        return memo;
-//    }
-//
-//    public void setMemo(String memo) {
-//        this.memo = memo;
-//    }
-//
-//    public String getBkDay() {
-//        return bkDay;
-//    }
-//
-//    public void setBkDay(String bkDay) {
-//        this.bkDay = bkDay;
-//    }
-//
-//    public Long getUserId() {
-//        return userId;
-//    }
-//
-//    public void setUserId(Long userId) {
-//        this.userId = userId;
-//    }
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public String getBtnRestor() {
-//        return btnRestor;
-//    }
-//
-//    public void setBtnRestor(String btnRestor) {
-//        this.btnRestor = btnRestor;
-//    }
-//
-//    public String getBtnDelete() {
-//        return btnDelete;
-//    }
-//
-//    public void setBtnDelete(String btnDelete) {
-//        this.btnDelete = btnDelete;
-//    }
-//
-//    public static OrclInfoDTO ConvertToDTO(OrclInfo orcl){
-//        if(null!=orcl){
-//            OrclInfoDTO dto = new OrclInfoDTO();
-//            dto.setId(orcl.getId());
-//            dto.setFileName(orcl.getFileName());
-//            dto.setFilePath(orcl.getFilePath());
-//            dto.setMemo(orcl.getMemo());
-//            if(null!=orcl.getBkDay()){
-//                dto.setBkDay(DateUtils.sdf1.format(orcl.getBkDay()));
-//            }
-//            if(null!=orcl.getUserInfo()){
-//                dto.setUserId(orcl.getUserInfo().getId());
-//                dto.setUserName(orcl.getUserInfo().getUsername());
-//            }
-//            return dto;
-//        }
-//        return new OrclInfoDTO();
-//    }
-//
-//    public static List<OrclInfoDTO> ConvertToDTO(List<OrclInfo> list){
-//        List<OrclInfoDTO> dtoList = new ArrayList<OrclInfoDTO>();
-//        for(OrclInfo orcl : list){
-//            dtoList.add(ConvertToDTO(orcl));
-//        }
-//        return dtoList;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/dto/SysLogInfoDTO.java b/src/main/java/com/casic/accessControl/sys/dto/SysLogInfoDTO.java
deleted file mode 100644
index 64d6c39..0000000
--- a/src/main/java/com/casic/accessControl/sys/dto/SysLogInfoDTO.java
+++ /dev/null
@@ -1,103 +0,0 @@
-//package com.casic.accessControl.sys.dto;
-//
-//import com.casic.accessControl.sys.domain.SysLogInfo;
-//import com.casic.accessControl.util.DateUtils;
-//
-//import java.util.ArrayList;
-//import java.util.Date;
-//import java.util.List;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//public class SysLogInfoDTO {
-//    private Long id;
-//    private String logType;//系统日志、运行日志、操作日志
-//    private String msg;
-//    private String logDay;
-//    private Long userId;
-//    private String userName;
-//    private String btn = "<a href='#' class='btn mini blue'>查看</a>";
-//
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    public String getLogType() {
-//        return logType;
-//    }
-//
-//    public void setLogType(String logType) {
-//        this.logType = logType;
-//    }
-//
-//    public String getMsg() {
-//        return msg;
-//    }
-//
-//    public void setMsg(String msg) {
-//        this.msg = msg;
-//    }
-//
-//    public String getLogDay() {
-//        return logDay;
-//    }
-//
-//    public void setLogDay(String logDay) {
-//        this.logDay = logDay;
-//    }
-//
-//    public Long getUserId() {
-//        return userId;
-//    }
-//
-//    public void setUserId(Long userId) {
-//        this.userId = userId;
-//    }
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public String getBtn() {
-//        return btn;
-//    }
-//
-//    public void setBtn(String btn) {
-//        this.btn = btn;
-//    }
-//
-//    public static SysLogInfoDTO ConvertToDTO(SysLogInfo log){
-//        if(null!=log){
-//            SysLogInfoDTO dto = new SysLogInfoDTO();
-//            dto.setId(log.getId());
-//            dto.setLogType(log.getLogType());
-//            if(null!=log.getLogDay()){
-//                dto.setLogDay(DateUtils.sdf2.format(log.getLogDay()));
-//            }
-//            dto.setMsg(log.getMsg());
-//            if(null!=log.getUser()){
-//                dto.setUserId(log.getUser().getId());
-//                dto.setUserName(log.getUser().getUserName());
-//            }
-//            return dto;
-//        }
-//        return new SysLogInfoDTO();
-//    }
-//
-//    public static List<SysLogInfoDTO> ConvertToDTO(List<SysLogInfo> list){
-//        List<SysLogInfoDTO> dtoList = new ArrayList<SysLogInfoDTO>();
-//        for(SysLogInfo log : list){
-//            dtoList.add(ConvertToDTO(log));
-//        }
-//        return dtoList;
-//    }
-//}

diff --git a/src/main/java/com/casic/accessControl/feature/domain/Feature.java b/src/main/java/com/casic/accessControl/feature/domain/Feature.java
deleted file mode 100644
index c89a0c2..0000000
--- a/src/main/java/com/casic/accessControl/feature/domain/Feature.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.casic.accessControl.feature.domain;
-
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-
-import javax.persistence.*;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-//点的信息
-@Entity
-@Table(name = "feature")
-public class Feature {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private Long id;
-    @Column(name = "longitude")
-    private Double longitude;
-    @Column(name = "latitude")
-    private Double latitude;
-    @Column(name = "featureName")
-    private String featureName;
-    @Column(name = "type")
-    private int type;
-    @Column(name = "isValid")
-    private Integer isValid;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "parent")
-    private Feature parent;
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "parent")
-    private List<Feature> children;
-    @Column(name = "memo")
-    private String memo;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "owner", referencedColumnName = "id")
-    private User owner;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "company", referencedColumnName = "id")
-    private Company company;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer isValid() {
-        return isValid;
-    }
-
-    public void setValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public Feature getParent() {
-        return parent;
-    }
-
-    public void setParent(Feature parent) {
-        this.parent = parent;
-    }
-
-    public List<Feature> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<Feature> children) {
-        this.children = children;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public User getOwner() {
-        return owner;
-    }
-
-    public void setOwner(User owner) {
-        this.owner = owner;
-    }
-
-    public Company getCompany() {
-        return company;
-    }
-
-    public void setCompany(Company company) {
-        this.company = company;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java b/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
deleted file mode 100644
index 256f261..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import com.casic.accessControl.feature.domain.Feature;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/17.
- */
-public class FeatureDto {
-    private Long id;
-    private Double longitude;
-    private Double latitude;
-    private String featureName;
-    private int type;
-    private Integer isValid;
-    private String memo;
-    private Long parentId;
-
-    private String btnEdit = "<a href='#' class='btn mini blue'><i class='icon-edit'></i>编辑</a>";
-    private String btnDelete = "<a href='#' class='btn mini red'><i class='icon-trash'></i>删除</a>";
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer getIsValid() {
-        return isValid;
-    }
-
-    public void setIsValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public Long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getBtnEdit() {
-        return btnEdit;
-    }
-
-    public void setBtnEdit(String btnEdit) {
-        this.btnEdit = btnEdit;
-    }
-
-    public String getBtnDelete() {
-        return btnDelete;
-    }
-
-    public void setBtnDelete(String btnDelete) {
-        this.btnDelete = btnDelete;
-    }
-
-    public static FeatureDto convert2FeatureDto(Feature feature) {
-        if (feature == null) {
-            return null;
-        }
-        FeatureDto featureDto = new FeatureDto();
-        featureDto.setId(feature.getId());
-        featureDto.setFeatureName(feature.getFeatureName());
-        featureDto.setIsValid(feature.isValid());
-        featureDto.setLatitude(feature.getLatitude());
-        featureDto.setLongitude(feature.getLongitude());
-        featureDto.setMemo(feature.getMemo());
-        featureDto.setType(feature.getType());
-        if (feature.getParent() != null)
-            featureDto.setParentId(feature.getParent().getId());
-        return featureDto;
-    }
-
-    public static List<FeatureDto> convert2FeatureDtos(List<Feature> features) {
-        List<FeatureDto> featureDtos = new ArrayList<FeatureDto>();
-        for (Feature feature : features) {
-            featureDtos.add(convert2FeatureDto(feature));
-        }
-        return featureDtos;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java b/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
deleted file mode 100644
index 785dcba..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/19.
- */
-public class OrgDto {
-    private long id;
-
-    private String name;
-
-    private long parentId;
-
-    private List<OrgDto> children = new ArrayList<OrgDto>();
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(long parentId) {
-        this.parentId = parentId;
-    }
-
-    public List<OrgDto> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<OrgDto> children) {
-        this.children = children;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java b/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
deleted file mode 100644
index a475e21..0000000
--- a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
+++ /dev/null
@@ -1,316 +0,0 @@
-package com.casic.accessControl.feature.manager;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.core.page.Page;
-import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.marker.manager.MarkerManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.DataTableParameter;
-import com.casic.accessControl.util.DataTableUtils;
-import org.apache.commons.collections.CollectionUtils;
-import org.hibernate.Criteria;
-import org.hibernate.Query;
-import org.hibernate.criterion.Restrictions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.jdbc.object.SqlQuery;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-@Service
-public class FeatureManager extends HibernateEntityDao<Feature> {
-
-    private Logger logger = LoggerFactory.getLogger(this.getClass());
-    @Resource
-    private MarkerManager markerManager;
-
-
-    public Feature getFeatureById(Long id) {
-        Feature feature = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("id", id)).add(Restrictions.eq("isValid", 1));
-            feature = (Feature) criteria.list().get(0);
-        } catch (Exception e) {
-            return null;
-        }
-        return feature;
-    }
-
-    public FeatureDto getFeatureDtoById(Long id) {
-        return FeatureDto.convert2FeatureDto(getFeatureById(id));
-    }
-
-    /**
-     * 根据id，软删除某个点或线或片
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param ids 多个id
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public String invalidFeature(String ids) {
-        if (StringUtils.isBlank(ids) || ids.indexOf(")") != -1) {//未传入值，直接返回，防止无效查询,过滤非法请求，防止sql注入
-            return "";
-        }
-        String[] idsArr = ids.split(",");
-        StringBuilder canDeleteIds = new StringBuilder("");
-        StringBuilder cantDeleleIds = new StringBuilder("");
-        //找出能删除的和不能删除的id组合
-        for (String id : idsArr) {
-            Long longId = Long.valueOf(id);
-            if (this.isCanDelete(longId)) {
-                if (canDeleteIds.length() > 0) {
-                    canDeleteIds.append(",");
-                }
-                canDeleteIds.append(id);
-
-            } else {
-                if (cantDeleleIds.length() > 0) {
-                    cantDeleleIds.append(",");
-                }
-                cantDeleleIds.append(id);
-            }
-        }
-
-        String temp1Ids = canDeleteIds.toString();
-        String temp2Ids = cantDeleleIds.toString();
-        if (StringUtils.isNotBlank(temp2Ids)) {//有不能删除的，都不删除
-            return "";
-        }
-        Query query = this.getSession().createQuery("update Feature f set f.isValid = 0 where id in (" + temp1Ids + ")");
-        query.executeUpdate();
-
-        return "success";
-    }
-
-    /**
-     * 判断feature是否可以删除
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param id
-     * @return
-     */
-    private boolean isCanDelete(Long id) {
-        Feature feature = this.getFeatureById(id);
-        if (feature.getParent() == null) {//所有用户共用的根节点不能删除
-            return false;
-        }
-        if (CollectionUtils.isNotEmpty(feature.getChildren())) {
-            for (Feature child : feature.getChildren()) {
-                if (child.isValid() == 1) {
-                    return false;
-                }
-            }
-
-        }
-        List<Marker> markers = markerManager.getMarkerByFeature(feature);
-        if (CollectionUtils.isNotEmpty(markers)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * 将数据库中的feature信息按照参数更新
-     *
-     * @param feature
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public void saveOrupdateFeature(Feature feature, User user) {
-        this.getSession().saveOrUpdate(feature);
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param user 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByUser")
-    public List<FeatureDto> getFeaturesByUser(Integer type, User user) {
-        if (user == null) {
-            return Collections.emptyList();
-        }
-        Company company = user.getCompany();
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("type", type));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-        return FeatureDto.convert2FeatureDtos(features);
-    }
-
-    /**
-     * 分页使用，datatable获取相应type的feature某页数据
-     *
-     * @param params
-     * @param user
-     * @return
-     */
-    public DataTable<FeatureDto> getPageFeatureListByTye(String params, Feature parent, User user) {
-        DataTable<FeatureDto> result = new DataTable<FeatureDto>();
-        DataTableParameter parameter = DataTableUtils.getDataTableParameterByJsonParam(params);
-        int start = parameter.getiDisplayStart();
-        int pageSize = parameter.getiDisplayLength();
-        int pageNo = (start / pageSize) + 1;
-        Criteria criteria = this.createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        Company company = user.getCompany();
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("isValid", 1)).add(Restrictions.eq("parent", parent));
-        Page page = pagedQuery(criteria, pageNo, pageSize);
-        List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos((List<Feature>) page.getResult());
-        result.setAaData(featureDtos);
-        result.setiTotalDisplayRecords((int) page.getTotalCount());
-        result.setiTotalRecords((int) page.getTotalCount());
-        result.setsEcho(parameter.getsEcho());
-        return result;
-
-
-    }
-
-    /**
-     * 获取层次结构列表,增加缓存
-     *
-     * @param type
-     * @param company
-     * @return
-     */
-    @Cacheable(value = "getOrgList")
-    public String getOrgList(Integer type, Company company) {
-        List<OrgDto> orgDtos = new ArrayList<OrgDto>();
-        List<Feature> features = this.getRootFeatures(type);
-        for (Feature feature : features) {
-            orgDtos.add(this.getChildrenByParentId(feature.getId(), company));
-        }
-        String jsonStr = null;
-        try {
-            jsonStr = new JsonMapper().toJson(orgDtos);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return jsonStr;
-    }
-
-    //    @Cacheable(value = "getChildrenByParentId", key = "#id")
-    public OrgDto getChildrenByParentId(Long id, Company company) {
-        if (id == null) {
-            return null;
-        }
-        Feature feature = getFeatureById(id);
-        if (feature == null) {
-            return null;
-        }
-        //创建OrgDto节点
-        OrgDto orgDto = new OrgDto();
-        orgDto.setId(id); //保存ID信息
-        orgDto.setName(feature.getFeatureName());
-        if (feature.getParent() != null) {
-            orgDto.setParentId(feature.getParent().getId());
-        }
-        List<Feature> departments = this.getActiveChildrenOrgs(feature, company);
-        for (Feature fea : departments) {
-            orgDto.getChildren().add(this.getChildrenByParentId(fea.getId(), company));
-        }
-        return orgDto;
-    }
-
-    //    @Cacheable(value = "getActiveChildrenOrgs", key = "#department.getId()")
-    private List<Feature> getActiveChildrenOrgs(Feature department, Company company) {
-        List<Feature> features = new ArrayList<Feature>();
-        for (Feature feature : department.getChildren()) {
-            if (feature.isValid() == 1 && feature.getCompany().getId().equals(company.getId())) {
-                features.add(feature);
-            }
-        }
-        return features;
-    }
-
-
-    public List<Feature> getRootFeatures(Integer type) {
-        List<Feature> features = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("type", type)).add(Restrictions.isNull("parent"));
-            features = criteria.list();
-        } catch (Exception e) {
-            return Collections.emptyList();
-        }
-        return features;
-
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param company 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByCompany", key = "#company.getId()")
-    public List<Feature> getFeaturesByCompany(Company company) {
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-        criteria.add(Restrictions.eq("company", company));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-
-        for (Feature f : features) {
-            f.getChildren().toString();
-            f.getOwner().toString();
-            if (f.getParent() != null)
-                f.getParent().toString();
-        }
-        return features;
-    }
-
-    /**
-     * 根据组织结构的id获取叶子节点
-     ***重要：**已更改为包含本节点****
-     * @param type
-     * @param feature
-     * @return
-     */
-    public List<Feature> getLeafByParentId(Integer type, Feature feature) {
-        if (feature == null || feature.isValid() == 0) return Collections.emptyList();
-        List<Feature> features = new ArrayList<Feature>();
-        if (CollectionUtils.isEmpty(feature.getChildren())) {
-            features.add(feature);
-            return features;
-        }
-        List<Feature> children = feature.getChildren();
-        boolean flag = false;
-        for (Feature child : children) {
-            if (child.isValid() == 1) {
-                flag = true;
-                features.addAll(getLeafByParentId(type, child));
-            }
-        }
-//        if (!flag) {//没有有效的子节点
-            features.add(feature);
-//        }
-        return features;
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java b/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
deleted file mode 100644
index a706a36..0000000
--- a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package com.casic.accessControl.feature.web;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.Role;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.CompanyManager;
-import com.casic.accessControl.user.manager.UserManager;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.StringUtils;
-import com.casic.accessControl.xls.Common;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import sun.org.mozilla.javascript.internal.EcmaError;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.IOException;
-import java.util.*;
-
-/**
- * 提供http访问接口
- * Created by lenovo on 2016/5/16.
- */
-@Controller
-@RequestMapping(value = "feature")
-public class FeatureController {
-    @Autowired
-    private FeatureManager featureManager;
-    @Autowired
-    private UserManager userManager;
-    @Autowired
-    private CompanyManager companyManager;
-
-    @RequestMapping(value = "org-list")
-    @ResponseBody
-    public String getOrgList(@RequestParam(required = true) Integer type, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Company company = user.getCompany();
-        return featureManager.getOrgList(type, company);
-    }
-
-    @RequestMapping(value = "org-list-na")
-    @ResponseBody
-    public Map<String, String> getOrgListNa(@RequestParam Long userId) {//na端所有传过来的userid都是公司id
-        Map<String, String> res = new HashMap<String, String>();
-        res.put("message", "列表获取失败");
-        try {
-//            User user = userManager.getUserById(userId);//获取当前登录用户
-//            Company company = user.getCompany();
-            Company company = companyManager.getCompanyById(userId);
-            String areas = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.AREA.getIndex(), company);
-            String lines = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.LINE.getIndex(), company);
-            res.put("feature", areas);
-            res.put("line", lines);
-        } catch (Exception e) {
-            return res;
-        }
-        res.put("message", "成功获取");
-        return res;
-    }
-
-    @RequestMapping(value = "getFeature")
-    @ResponseBody
-    public Map<String, Object> getFeaturesByUser(@RequestParam(required = true) Integer type, HttpSession session) {
-
-        Map<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        List<FeatureDto> list = featureManager.getFeaturesByUser(type, user);
-        if (list == null) {//获取列表失败
-            result.put("message", "获取列表出现错误");
-            return result;
-        } else {
-            result.put("data", list);
-            result.put("message", "获取列表成功");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "getSubFeatureList")
-    public void getSubFeatureList(@RequestParam(required = true) String jsonParams, @RequestParam(required = false) Long parentId, HttpServletResponse response, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Feature parent = featureManager.getFeatureById(parentId);
-        DataTable<FeatureDto> dtoDataTable = featureManager.getPageFeatureListByTye(jsonParams, parent, user);
-        Gson gson = new Gson();
-        String json = gson.toJson(dtoDataTable);
-        response.setCharacterEncoding("utf-8");
-        try {
-            response.getWriter().write(json);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @RequestMapping(value = "delete")
-    @ResponseBody
-    public Map<String, Object> deleteFeatureById(@RequestParam(required = true) Long id, HttpSession session) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        try {
-            String res = featureManager.invalidFeature(id.toString());
-            if (StringUtils.isBlank(res)) {
-                result.put("message", "删除失败");
-            } else {
-                result.put("message", "删除成功");
-                result.put("success", true);
-            }
-        } catch (Exception e) {
-            result.put("message", "删除失败");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "save")
-    @ResponseBody
-    public Map<String, Object> save(@RequestParam(required = true) String params, HttpSession session) {
-        Gson gson = new Gson();
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        Map markers = gson.fromJson(params, HashMap.class);
-        String featureName = (String) markers.get("featureName");
-        String memo = (String) markers.get("memo") == null ? "" : (String) markers.get("memo");
-        Long parentId = Long.valueOf(StringUtils.isBlank((String) markers.get("parentId")) ? "-1" : (String) markers.get("parentId"));//不知为什么转过来为Double
-        Long id = Long.valueOf(StringUtils.isBlank((String) markers.get("id")) ? "-1" : (String) markers.get("id"));
-
-
-        if (StringUtils.isBlank(featureName) || parentId.equals(-1L)) {
-            result.put("message", "必要参数未传送");
-            return result;
-        }
-        Feature feature = new Feature();
-        feature.setValid(1);
-        Feature parent = featureManager.getFeatureById(parentId);
-        feature.setParent(parent);
-        feature.setFeatureName(featureName);
-        feature.setMemo(memo);
-        feature.setOwner(user);
-        feature.setCompany(user.getCompany());
-        feature.setType(parent.getType());
-        if (!id.equals(-1L)) {
-            feature.setId(id);
-        }
-        try {
-            featureManager.saveOrupdateFeature(feature, user);
-            result.put("message", "保存成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "保存失败");
-        }
-        return result;
-
-    }
-
-
-    @RequestMapping(value = "getFeatureById")
-    @ResponseBody
-    public Map<String, Object> getFeatureById(@RequestParam(required = true) Long id) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        try {
-            FeatureDto feature = featureManager.getFeatureDtoById(id);
-            result.put("data", feature);
-            result.put("message", "获取成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "获取失败");
-        }
-        return result;
-
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
index 08a290e..3f53635 100644
--- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
+++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
@@ -1,6 +1,6 @@
 package com.casic.accessControl.marker.dto;
 
-import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.domain.Feature;
 import com.casic.accessControl.marker.domain.Marker;
 import org.apache.commons.collections.CollectionUtils;
 
diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
index 080b291..7fe7434 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -4,8 +4,6 @@
 import com.casic.accessControl.core.hibernate.HibernateEntityDao;
 import com.casic.accessControl.core.page.Page;
 import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.user.domain.Company;
@@ -49,9 +47,6 @@
 public class MarkerManager extends HibernateEntityDao<Marker> {
 
     @Resource
-    private FeatureManager featureManager;
-
-    @Resource
     private UserManager userInfoManager;
 
 
@@ -154,33 +149,33 @@
 
     //获取marker
 //    @Cacheable(value = "getMarkerByFeature", key = "#feature.getId()")
-    public List<Marker> getMarkerByFeature(Feature feature) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            criteria.add(Restrictions.eq("belongLine", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            criteria.add(Restrictions.eq("belongLine", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
-    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
-            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
+//            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
     public boolean saveMarker(Marker marker) {
         try {
@@ -465,7 +460,7 @@
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setLayStyle(sheet.getCell(indexMap.get("layStyle"), i).getContents());
-                } else if(recordTypeFlag == 4) {
+                } else if (recordTypeFlag == 4) {
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setBelowType(sheet.getCell(indexMap.get("belowType"), i).getContents());
diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
index a19f2f5..7675e1f 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -2,9 +2,6 @@
 
 import com.casic.accessControl.core.ext.export.CsvExportor;
 import com.casic.accessControl.core.ext.export.TableModel;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.manager.MarkerManager;
diff --git a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java b/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
deleted file mode 100644
index e69de29..0000000
--- a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
+++ /dev/null
diff --git a/src/main/java/com/casic/accessControl/rs/FeatureResource.java b/src/main/java/com/casic/accessControl/rs/FeatureResource.java
index 68aeb97..e97f18b 100644
--- a/src/main/java/com/casic/accessControl/rs/FeatureResource.java
+++ b/src/main/java/com/casic/accessControl/rs/FeatureResource.java
@@ -1,65 +1,65 @@
-package com.casic.accessControl.rs;
-
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.UserManager;
-import com.google.gson.Gson;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import javax.annotation.Resource;
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
-* Created by admin on 2015/1/15.
-*/
-@Component
-@Path("feature")
-public class FeatureResource
-{
-    private static Logger logger = LoggerFactory.getLogger(FeatureResource.class);
-
-    @Resource
-    private UserManager userManager;
-
-    @Resource
-    private FeatureManager featureManager;
-
-    @GET
-    @Path("get")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map get(@QueryParam("userName") String userName ){
-        Map map = new HashMap<String, Object>();
-        try {
-            User user = userManager.getUserByName(userName);
-            if (user == null) {
-                map.put("success", "false");
-                map.put("message", "人员不存在！");
-                return map;
-            }
-            Company company = user.getCompany();
-            if (company!=null)
-            {
-                List<Feature> features = featureManager.getFeaturesByCompany(company);
-                List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos(features);
-                map.put("success", "true");
-                map.put("message", featureDtos);
-            }
-        }
-        catch (Exception e)
-        {
-            map.put("success", "false");
-            map.put("message", e.getMessage());
-        }
-        return  map;
-    }
-}
+//package com.casic.accessControl.rs;
+//
+//import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.dto.FeatureDto;
+//import com.casic.accessControl.feature.manager.FeatureManager;
+//import com.casic.accessControl.user.domain.Company;
+//import com.casic.accessControl.user.domain.User;
+//import com.casic.accessControl.user.manager.UserManager;
+//import com.google.gson.Gson;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.stereotype.Component;
+//import org.springframework.web.bind.annotation.RequestParam;
+//
+//import javax.annotation.Resource;
+//import javax.ws.rs.*;
+//import javax.ws.rs.core.MediaType;
+//import java.util.HashMap;
+//import java.util.List;
+//import java.util.Map;
+//
+///**
+//* Created by admin on 2015/1/15.
+//*/
+//@Component
+//@Path("feature")
+//public class FeatureResource
+//{
+//    private static Logger logger = LoggerFactory.getLogger(FeatureResource.class);
+//
+//    @Resource
+//    private UserManager userManager;
+//
+//    @Resource
+//    private FeatureManager featureManager;
+//
+//    @GET
+//    @Path("get")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public Map get(@QueryParam("userName") String userName ){
+//        Map map = new HashMap<String, Object>();
+//        try {
+//            User user = userManager.getUserByName(userName);
+//            if (user == null) {
+//                map.put("success", "false");
+//                map.put("message", "人员不存在！");
+//                return map;
+//            }
+//            Company company = user.getCompany();
+//            if (company!=null)
+//            {
+//                List<Feature> features = featureManager.getFeaturesByCompany(company);
+//                List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos(features);
+//                map.put("success", "true");
+//                map.put("message", featureDtos);
+//            }
+//        }
+//        catch (Exception e)
+//        {
+//            map.put("success", "false");
+//            map.put("message", e.getMessage());
+//        }
+//        return  map;
+//    }
+//}
diff --git a/src/main/java/com/casic/accessControl/rs/MapInfo.java b/src/main/java/com/casic/accessControl/rs/MapInfo.java
deleted file mode 100644
index a77fce9..0000000
--- a/src/main/java/com/casic/accessControl/rs/MapInfo.java
+++ /dev/null
@@ -1,131 +0,0 @@
-//package com.casic.accessControl.rs;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-///**
-// * Created by admin on 2015/8/26.
-// */
-//public class MapInfo {
-//
-//    private String mapUrl;
-//
-//    private String updateTime;
-//
-//    private String uploader;
-//
-//    private String name;
-//
-//    private String uuid;
-//
-//    private String site;
-//    /*
-//    0:草稿
-//    1：待审核
-//    2：通过
-//    3: 驳回
-//     */
-//    private String status;
-//
-//    //
-//    private int id;
-//
-//
-//    public String getMapUrl()
-//    {
-//        return mapUrl;
-//    }
-//
-//    public void setMapUrl(String mapUrl)
-//    {
-//        this.mapUrl = mapUrl;
-//    }
-//
-//    public String getUpdateTime()
-//    {
-//        return updateTime;
-//    }
-//
-//    public void setUpdateTime(String updateTime)
-//    {
-//        this.updateTime = updateTime;
-//    }
-//
-//    public String getUploader()
-//    {
-//        return uploader;
-//    }
-//
-//    public void setUploader(String uploader)
-//    {
-//        this.uploader = uploader;
-//    }
-//
-//    public String getName()
-//    {
-//        return name;
-//    }
-//
-//    public void setName(String name)
-//    {
-//        this.name = name;
-//    }
-//
-//    public String getUuid()
-//    {
-//        return uuid;
-//    }
-//
-//    public void setUuid(String uuid)
-//    {
-//        this.uuid = uuid;
-//    }
-//
-//    public String getSite()
-//    {
-//        return site;
-//    }
-//
-//    public void setSite(String site)
-//    {
-//        this.site = site;
-//    }
-//
-//    public String getStatus()
-//    {
-//        return status;
-//    }
-//
-//    public void setStatus(String status)
-//    {
-//        this.status = status;
-//    }
-//
-//    public int getId()
-//    {
-//        return id;
-//    }
-//
-//    public void setId(int id)
-//    {
-//        this.id = id;
-//    }
-//
-//    public static List<MapInfo> getMockerMaps()
-//    {
-//        List<MapInfo> maps = new ArrayList<MapInfo>();
-//        for (int i = 0; i < 20; i++)
-//        {
-//            MapInfo map = new MapInfo();
-//            map.setId(i);
-//            map.setUploader("张帆");
-//            map.setMapUrl("http://192.168.0.111:9080/accessControl/logo.jpg");
-//            map.setSite("永旺路"+i);
-//            map.setUpdateTime("2015-08-02");
-//            map.setStatus("待审核");
-//            maps.add(map);
-//        }
-//        return maps;
-//
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/rs/MarkResource.java b/src/main/java/com/casic/accessControl/rs/MarkResource.java
index 8ae4d85..cef1580 100644
--- a/src/main/java/com/casic/accessControl/rs/MarkResource.java
+++ b/src/main/java/com/casic/accessControl/rs/MarkResource.java
@@ -1,7 +1,7 @@
 package com.casic.accessControl.rs;
 
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
+//import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.manager.MarkerManager;
 import com.casic.accessControl.user.domain.Company;
@@ -35,8 +35,8 @@
     @Resource
     private MarkerManager markerManager;
 
-    @Resource
-    private FeatureManager featureManager;
+//    @Resource
+//    private FeatureManager featureManager;
 
     @GET
     @Path("post")
diff --git a/src/main/java/com/casic/accessControl/rs/UserObj.java b/src/main/java/com/casic/accessControl/rs/UserObj.java
deleted file mode 100644
index c0fe651..0000000
--- a/src/main/java/com/casic/accessControl/rs/UserObj.java
+++ /dev/null
@@ -1,61 +0,0 @@
-//package com.casic.accessControl.rs;
-//
-//import java.io.Serializable;
-//
-///**
-// * Created by admin on 2015/10/9.
-// */
-//public class UserObj implements Serializable {
-//    private String userName;
-//    private String password;
-//    private String appId;
-//    /*
-//    roles:��ɫ֮���Զ��ŷָ�
-//     */
-//    private String roles;
-//
-//    /*
-//    authorities:Ȩ��֮���Զ��ŷָ�
-//    */
-//    private String authorities;
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public String getPassword() {
-//        return password;
-//    }
-//
-//    public void setPassword(String password) {
-//        this.password = password;
-//    }
-//
-//    public String getAppId() {
-//        return appId;
-//    }
-//
-//    public void setAppId(String appId) {
-//        this.appId = appId;
-//    }
-//
-//    public String getRoles() {
-//        return roles;
-//    }
-//
-//    public void setRoles(String roles) {
-//        this.roles = roles;
-//    }
-//
-//    public String getAuthorities() {
-//        return authorities;
-//    }
-//
-//    public void setAuthorities(String authorities) {
-//        this.authorities = authorities;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java b/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java
deleted file mode 100644
index ac60ed5..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java
+++ /dev/null
@@ -1,65 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//import org.geotools.referencing.operation.transform.NADCONTransform;
-//
-//import javax.persistence.*;
-//
-///**
-// * Created by test203 on 2015/10/29.
-// */
-//@Entity
-//@Table(name = "ZX_DATABASE_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_DATABASE_INFO_ID", sequenceName = "SEQ_ZX_DATABASE_INFO_ID", allocationSize = 1, initialValue = 1)
-//public class DataBaseInfo {
-//    private Long id;
-//    private String account;
-//    private String password;
-//    private String sid;
-//    private String owner;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_ZX_DATABASE_INFO_ID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "ACCOUNT", nullable = false)
-//    public String getAccount() {
-//        return account;
-//    }
-//
-//    public void setAccount(String account) {
-//        this.account = account;
-//    }
-//
-//    @Column(name = "PASSWORD", nullable = false)
-//    public String getPassword() {
-//        return password;
-//    }
-//
-//    public void setPassword(String password) {
-//        this.password = password;
-//    }
-//
-//    @Column(name = "SID", nullable = false)
-//    public String getSid() {
-//        return sid;
-//    }
-//
-//    public void setSid(String sid) {
-//        this.sid = sid;
-//    }
-//
-//    @Column(name = "OWNER", nullable = false)
-//    public String getOwner() {
-//        return owner;
-//    }
-//
-//    public void setOwner(String owner) {
-//        this.owner = owner;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java b/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java
deleted file mode 100644
index 9578060..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java
+++ /dev/null
@@ -1,77 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//import com.casic.accessControl.org.domain.UserInfo;
-//
-//import javax.persistence.*;
-//import java.util.Date;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Entity
-//@Table(name = "ZX_ORCL_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_ORCL_INFO_ID",sequenceName = "SEQ_ZX_ORCL_INFO_ID",allocationSize = 1,initialValue = 1)
-//public class OrclInfo {
-//    private Long id;
-//    private String fileName;
-//    private String filePath;
-//    private String memo;
-//    private Date bkDay = new Date();
-//    private UserInfo userInfo;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE,generator = "SEQ_ZX_ORCL_INFO_ID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "FILE_NAME",nullable = false)
-//    public String getFileName() {
-//        return fileName;
-//    }
-//
-//    public void setFileName(String fileName) {
-//        this.fileName = fileName;
-//    }
-//
-//    @Column(name = "FILE_PATH",nullable = false)
-//    public String getFilePath() {
-//        return filePath;
-//    }
-//
-//    public void setFilePath(String filePath) {
-//        this.filePath = filePath;
-//    }
-//
-//    @Column(name = "MEMO")
-//    public String getMemo() {
-//        return memo;
-//    }
-//
-//    public void setMemo(String memo) {
-//        this.memo = memo;
-//    }
-//
-//    @Column(name = "BK_DAY")
-//    public Date getBkDay() {
-//        return bkDay;
-//    }
-//
-//    public void setBkDay(Date bkDay) {
-//        this.bkDay = bkDay;
-//    }
-//
-//    @ManyToOne(fetch = FetchType.LAZY)
-//    @JoinColumn(name = "USER_ID")
-//    public UserInfo getUserInfo() {
-//        return userInfo;
-//    }
-//
-//    public void setUserInfo(UserInfo userInfo) {
-//        this.userInfo = userInfo;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/SysLogInfo.java b/src/main/java/com/casic/accessControl/sys/domain/SysLogInfo.java
deleted file mode 100644
index 60e5583..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/SysLogInfo.java
+++ /dev/null
@@ -1,70 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//
-//import com.casic.accessControl.user.domain.UserInfo;
-//
-//import javax.persistence.*;
-//import java.io.Serializable;
-//import java.util.Date;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Entity
-//@Table(name = "ZX_SYS_LOG_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_SYS_LOG_ID",sequenceName = "SEQ_ZX_SYS_LOG_ID",allocationSize = 1,initialValue = 1)
-//public class SysLogInfo implements Serializable{
-//    private Long id;
-//    private String logType;//系统日志、运行日志、操作日志
-//    private String msg;
-//    private Date logDay = new Date();
-//    private UserInfo user;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE,generator = "SEQ_ZX_SYS_LOG_ID")
-//    @Column(name = "DBID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "LOG_TYPE",nullable = false)
-//    public String getLogType() {
-//        return logType;
-//    }
-//
-//    public void setLogType(String logType) {
-//        this.logType = logType;
-//    }
-//
-//    @Column(name = "LOG_MSG",nullable = false)
-//    public String getMsg() {
-//        return msg;
-//    }
-//
-//    public void setMsg(String msg) {
-//        this.msg = msg;
-//    }
-//
-//    @Column(name = "LOG_DAY")
-//    public Date getLogDay() {
-//        return logDay;
-//    }
-//
-//    public void setLogDay(Date logDay) {
-//        this.logDay = logDay;
-//    }
-//
-//    @ManyToOne(fetch = FetchType.LAZY)
-//    @JoinColumn(name = "USER_ID")
-//    public UserInfo getUser() {
-//        return user;
-//    }
-//
-//    public void setUser(UserInfo user) {
-//        this.user = user;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/dto/ExcelInfoDTO.java b/src/main/java/com/casic/accessControl/sys/dto/ExcelInfoDTO.java
deleted file mode 100644
index 2fe496e..0000000
--- a/src/main/java/com/casic/accessControl/sys/dto/ExcelInfoDTO.java
+++ /dev/null
@@ -1,77 +0,0 @@
-//package com.casic.accessControl.sys.dto;
-//
-//import com.casic.accessControl.sys.domain.SysLogInfo;
-//import com.casic.accessControl.util.DateUtils;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-///**
-// * Created by test203 on 2015/10/23.
-// */
-//public class ExcelInfoDTO {
-//    private String logType;//系统日志、运行日志、操作日志
-//    private String msg;
-//    private String logDay;
-//    private String userName;
-//
-//    public String getLogType() {
-//        return logType;
-//    }
-//
-//    public void setLogType(String logType) {
-//        this.logType = logType;
-//    }
-//
-//    public String getMsg() {
-//        return msg;
-//    }
-//
-//    public void setMsg(String msg) {
-//        this.msg = msg;
-//    }
-//
-//    public String getLogDay() {
-//        return logDay;
-//    }
-//
-//    public void setLogDay(String logDay) {
-//        this.logDay = logDay;
-//    }
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public static ExcelInfoDTO ConvertToDTO(SysLogInfo logInfo){
-//        if(null!=logInfo){
-//            ExcelInfoDTO dto = new ExcelInfoDTO();
-//            dto.setLogType(logInfo.getLogType());
-//            if(null!=logInfo.getLogDay()){
-//                dto.setLogDay(DateUtils.sdf2.format(logInfo.getLogDay()));
-//            }else {
-//                dto.setLogDay(" ");
-//            }
-//            dto.setMsg(logInfo.getMsg());
-//            if(null!=logInfo.getUser()){
-//                dto.setUserName(logInfo.getUser().getUserName());
-//            }else {
-//                dto.setUserName(" ");
-//            }
-//            return dto;
-//        }
-//        return new ExcelInfoDTO();
-//    }
-//
-//    public static List<ExcelInfoDTO> ConvertToDTO(List<SysLogInfo> list){
-//        List<ExcelInfoDTO> dtoList = new ArrayList<ExcelInfoDTO>();
-//        for(SysLogInfo log : list){
-//            dtoList.add(ConvertToDTO(log));
-//        }
-//        return dtoList;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/dto/OrclInfoDTO.java b/src/main/java/com/casic/accessControl/sys/dto/OrclInfoDTO.java
deleted file mode 100644
index 46a261d..0000000
--- a/src/main/java/com/casic/accessControl/sys/dto/OrclInfoDTO.java
+++ /dev/null
@@ -1,124 +0,0 @@
-//package com.casic.accessControl.sys.dto;
-//
-//import com.casic.accessControl.org.domain.UserInfo;
-//import com.casic.accessControl.shp.domain.LayerInfo;
-//import com.casic.accessControl.sys.domain.OrclInfo;
-//import com.casic.accessControl.util.DateUtils;
-//
-//import java.util.ArrayList;
-//import java.util.Date;
-//import java.util.List;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//public class OrclInfoDTO {
-//    private Long id;
-//    private String fileName;
-//    private String filePath;
-//    private String memo;
-//    private String bkDay;
-//    private Long userId;
-//    private String userName;
-//    private String btnRestor = "<a href='#' class='btn mini blue'>还原</a>";
-//    private String btnDelete = "<a href='#' class='btn mini red'>删除</a>";
-//
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    public String getFileName() {
-//        return fileName;
-//    }
-//
-//    public void setFileName(String fileName) {
-//        this.fileName = fileName;
-//    }
-//
-//    public String getFilePath() {
-//        return filePath;
-//    }
-//
-//    public void setFilePath(String filePath) {
-//        this.filePath = filePath;
-//    }
-//
-//    public String getMemo() {
-//        return memo;
-//    }
-//
-//    public void setMemo(String memo) {
-//        this.memo = memo;
-//    }
-//
-//    public String getBkDay() {
-//        return bkDay;
-//    }
-//
-//    public void setBkDay(String bkDay) {
-//        this.bkDay = bkDay;
-//    }
-//
-//    public Long getUserId() {
-//        return userId;
-//    }
-//
-//    public void setUserId(Long userId) {
-//        this.userId = userId;
-//    }
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public String getBtnRestor() {
-//        return btnRestor;
-//    }
-//
-//    public void setBtnRestor(String btnRestor) {
-//        this.btnRestor = btnRestor;
-//    }
-//
-//    public String getBtnDelete() {
-//        return btnDelete;
-//    }
-//
-//    public void setBtnDelete(String btnDelete) {
-//        this.btnDelete = btnDelete;
-//    }
-//
-//    public static OrclInfoDTO ConvertToDTO(OrclInfo orcl){
-//        if(null!=orcl){
-//            OrclInfoDTO dto = new OrclInfoDTO();
-//            dto.setId(orcl.getId());
-//            dto.setFileName(orcl.getFileName());
-//            dto.setFilePath(orcl.getFilePath());
-//            dto.setMemo(orcl.getMemo());
-//            if(null!=orcl.getBkDay()){
-//                dto.setBkDay(DateUtils.sdf1.format(orcl.getBkDay()));
-//            }
-//            if(null!=orcl.getUserInfo()){
-//                dto.setUserId(orcl.getUserInfo().getId());
-//                dto.setUserName(orcl.getUserInfo().getUsername());
-//            }
-//            return dto;
-//        }
-//        return new OrclInfoDTO();
-//    }
-//
-//    public static List<OrclInfoDTO> ConvertToDTO(List<OrclInfo> list){
-//        List<OrclInfoDTO> dtoList = new ArrayList<OrclInfoDTO>();
-//        for(OrclInfo orcl : list){
-//            dtoList.add(ConvertToDTO(orcl));
-//        }
-//        return dtoList;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/dto/SysLogInfoDTO.java b/src/main/java/com/casic/accessControl/sys/dto/SysLogInfoDTO.java
deleted file mode 100644
index 64d6c39..0000000
--- a/src/main/java/com/casic/accessControl/sys/dto/SysLogInfoDTO.java
+++ /dev/null
@@ -1,103 +0,0 @@
-//package com.casic.accessControl.sys.dto;
-//
-//import com.casic.accessControl.sys.domain.SysLogInfo;
-//import com.casic.accessControl.util.DateUtils;
-//
-//import java.util.ArrayList;
-//import java.util.Date;
-//import java.util.List;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//public class SysLogInfoDTO {
-//    private Long id;
-//    private String logType;//系统日志、运行日志、操作日志
-//    private String msg;
-//    private String logDay;
-//    private Long userId;
-//    private String userName;
-//    private String btn = "<a href='#' class='btn mini blue'>查看</a>";
-//
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    public String getLogType() {
-//        return logType;
-//    }
-//
-//    public void setLogType(String logType) {
-//        this.logType = logType;
-//    }
-//
-//    public String getMsg() {
-//        return msg;
-//    }
-//
-//    public void setMsg(String msg) {
-//        this.msg = msg;
-//    }
-//
-//    public String getLogDay() {
-//        return logDay;
-//    }
-//
-//    public void setLogDay(String logDay) {
-//        this.logDay = logDay;
-//    }
-//
-//    public Long getUserId() {
-//        return userId;
-//    }
-//
-//    public void setUserId(Long userId) {
-//        this.userId = userId;
-//    }
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public String getBtn() {
-//        return btn;
-//    }
-//
-//    public void setBtn(String btn) {
-//        this.btn = btn;
-//    }
-//
-//    public static SysLogInfoDTO ConvertToDTO(SysLogInfo log){
-//        if(null!=log){
-//            SysLogInfoDTO dto = new SysLogInfoDTO();
-//            dto.setId(log.getId());
-//            dto.setLogType(log.getLogType());
-//            if(null!=log.getLogDay()){
-//                dto.setLogDay(DateUtils.sdf2.format(log.getLogDay()));
-//            }
-//            dto.setMsg(log.getMsg());
-//            if(null!=log.getUser()){
-//                dto.setUserId(log.getUser().getId());
-//                dto.setUserName(log.getUser().getUserName());
-//            }
-//            return dto;
-//        }
-//        return new SysLogInfoDTO();
-//    }
-//
-//    public static List<SysLogInfoDTO> ConvertToDTO(List<SysLogInfo> list){
-//        List<SysLogInfoDTO> dtoList = new ArrayList<SysLogInfoDTO>();
-//        for(SysLogInfo log : list){
-//            dtoList.add(ConvertToDTO(log));
-//        }
-//        return dtoList;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/manager/DataBaseInfoManager.java b/src/main/java/com/casic/accessControl/sys/manager/DataBaseInfoManager.java
deleted file mode 100644
index b1395e6..0000000
--- a/src/main/java/com/casic/accessControl/sys/manager/DataBaseInfoManager.java
+++ /dev/null
@@ -1,19 +0,0 @@
-//package com.casic.accessControl.sys.manager;
-//
-//import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-//import com.casic.accessControl.sys.domain.DataBaseInfo;
-//import org.hibernate.Criteria;
-//import org.springframework.stereotype.Service;
-//
-///**
-// * Created by test203 on 2015/10/29.
-// */
-//@Service
-//public class DataBaseInfoManager extends HibernateEntityDao<DataBaseInfo>{
-//    public Criteria getCriteria(){
-//        return  getSession().createCriteria(DataBaseInfo.class);
-//    }
-//    public Object getDataBaseInfo(){
-//        return getCriteria().uniqueResult();
-//    }
-//}

diff --git a/src/main/java/com/casic/accessControl/feature/domain/Feature.java b/src/main/java/com/casic/accessControl/feature/domain/Feature.java
deleted file mode 100644
index c89a0c2..0000000
--- a/src/main/java/com/casic/accessControl/feature/domain/Feature.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.casic.accessControl.feature.domain;
-
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-
-import javax.persistence.*;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-//点的信息
-@Entity
-@Table(name = "feature")
-public class Feature {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private Long id;
-    @Column(name = "longitude")
-    private Double longitude;
-    @Column(name = "latitude")
-    private Double latitude;
-    @Column(name = "featureName")
-    private String featureName;
-    @Column(name = "type")
-    private int type;
-    @Column(name = "isValid")
-    private Integer isValid;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "parent")
-    private Feature parent;
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "parent")
-    private List<Feature> children;
-    @Column(name = "memo")
-    private String memo;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "owner", referencedColumnName = "id")
-    private User owner;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "company", referencedColumnName = "id")
-    private Company company;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer isValid() {
-        return isValid;
-    }
-
-    public void setValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public Feature getParent() {
-        return parent;
-    }
-
-    public void setParent(Feature parent) {
-        this.parent = parent;
-    }
-
-    public List<Feature> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<Feature> children) {
-        this.children = children;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public User getOwner() {
-        return owner;
-    }
-
-    public void setOwner(User owner) {
-        this.owner = owner;
-    }
-
-    public Company getCompany() {
-        return company;
-    }
-
-    public void setCompany(Company company) {
-        this.company = company;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java b/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
deleted file mode 100644
index 256f261..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import com.casic.accessControl.feature.domain.Feature;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/17.
- */
-public class FeatureDto {
-    private Long id;
-    private Double longitude;
-    private Double latitude;
-    private String featureName;
-    private int type;
-    private Integer isValid;
-    private String memo;
-    private Long parentId;
-
-    private String btnEdit = "<a href='#' class='btn mini blue'><i class='icon-edit'></i>编辑</a>";
-    private String btnDelete = "<a href='#' class='btn mini red'><i class='icon-trash'></i>删除</a>";
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer getIsValid() {
-        return isValid;
-    }
-
-    public void setIsValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public Long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getBtnEdit() {
-        return btnEdit;
-    }
-
-    public void setBtnEdit(String btnEdit) {
-        this.btnEdit = btnEdit;
-    }
-
-    public String getBtnDelete() {
-        return btnDelete;
-    }
-
-    public void setBtnDelete(String btnDelete) {
-        this.btnDelete = btnDelete;
-    }
-
-    public static FeatureDto convert2FeatureDto(Feature feature) {
-        if (feature == null) {
-            return null;
-        }
-        FeatureDto featureDto = new FeatureDto();
-        featureDto.setId(feature.getId());
-        featureDto.setFeatureName(feature.getFeatureName());
-        featureDto.setIsValid(feature.isValid());
-        featureDto.setLatitude(feature.getLatitude());
-        featureDto.setLongitude(feature.getLongitude());
-        featureDto.setMemo(feature.getMemo());
-        featureDto.setType(feature.getType());
-        if (feature.getParent() != null)
-            featureDto.setParentId(feature.getParent().getId());
-        return featureDto;
-    }
-
-    public static List<FeatureDto> convert2FeatureDtos(List<Feature> features) {
-        List<FeatureDto> featureDtos = new ArrayList<FeatureDto>();
-        for (Feature feature : features) {
-            featureDtos.add(convert2FeatureDto(feature));
-        }
-        return featureDtos;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java b/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
deleted file mode 100644
index 785dcba..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/19.
- */
-public class OrgDto {
-    private long id;
-
-    private String name;
-
-    private long parentId;
-
-    private List<OrgDto> children = new ArrayList<OrgDto>();
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(long parentId) {
-        this.parentId = parentId;
-    }
-
-    public List<OrgDto> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<OrgDto> children) {
-        this.children = children;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java b/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
deleted file mode 100644
index a475e21..0000000
--- a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
+++ /dev/null
@@ -1,316 +0,0 @@
-package com.casic.accessControl.feature.manager;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.core.page.Page;
-import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.marker.manager.MarkerManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.DataTableParameter;
-import com.casic.accessControl.util.DataTableUtils;
-import org.apache.commons.collections.CollectionUtils;
-import org.hibernate.Criteria;
-import org.hibernate.Query;
-import org.hibernate.criterion.Restrictions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.jdbc.object.SqlQuery;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-@Service
-public class FeatureManager extends HibernateEntityDao<Feature> {
-
-    private Logger logger = LoggerFactory.getLogger(this.getClass());
-    @Resource
-    private MarkerManager markerManager;
-
-
-    public Feature getFeatureById(Long id) {
-        Feature feature = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("id", id)).add(Restrictions.eq("isValid", 1));
-            feature = (Feature) criteria.list().get(0);
-        } catch (Exception e) {
-            return null;
-        }
-        return feature;
-    }
-
-    public FeatureDto getFeatureDtoById(Long id) {
-        return FeatureDto.convert2FeatureDto(getFeatureById(id));
-    }
-
-    /**
-     * 根据id，软删除某个点或线或片
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param ids 多个id
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public String invalidFeature(String ids) {
-        if (StringUtils.isBlank(ids) || ids.indexOf(")") != -1) {//未传入值，直接返回，防止无效查询,过滤非法请求，防止sql注入
-            return "";
-        }
-        String[] idsArr = ids.split(",");
-        StringBuilder canDeleteIds = new StringBuilder("");
-        StringBuilder cantDeleleIds = new StringBuilder("");
-        //找出能删除的和不能删除的id组合
-        for (String id : idsArr) {
-            Long longId = Long.valueOf(id);
-            if (this.isCanDelete(longId)) {
-                if (canDeleteIds.length() > 0) {
-                    canDeleteIds.append(",");
-                }
-                canDeleteIds.append(id);
-
-            } else {
-                if (cantDeleleIds.length() > 0) {
-                    cantDeleleIds.append(",");
-                }
-                cantDeleleIds.append(id);
-            }
-        }
-
-        String temp1Ids = canDeleteIds.toString();
-        String temp2Ids = cantDeleleIds.toString();
-        if (StringUtils.isNotBlank(temp2Ids)) {//有不能删除的，都不删除
-            return "";
-        }
-        Query query = this.getSession().createQuery("update Feature f set f.isValid = 0 where id in (" + temp1Ids + ")");
-        query.executeUpdate();
-
-        return "success";
-    }
-
-    /**
-     * 判断feature是否可以删除
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param id
-     * @return
-     */
-    private boolean isCanDelete(Long id) {
-        Feature feature = this.getFeatureById(id);
-        if (feature.getParent() == null) {//所有用户共用的根节点不能删除
-            return false;
-        }
-        if (CollectionUtils.isNotEmpty(feature.getChildren())) {
-            for (Feature child : feature.getChildren()) {
-                if (child.isValid() == 1) {
-                    return false;
-                }
-            }
-
-        }
-        List<Marker> markers = markerManager.getMarkerByFeature(feature);
-        if (CollectionUtils.isNotEmpty(markers)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * 将数据库中的feature信息按照参数更新
-     *
-     * @param feature
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public void saveOrupdateFeature(Feature feature, User user) {
-        this.getSession().saveOrUpdate(feature);
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param user 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByUser")
-    public List<FeatureDto> getFeaturesByUser(Integer type, User user) {
-        if (user == null) {
-            return Collections.emptyList();
-        }
-        Company company = user.getCompany();
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("type", type));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-        return FeatureDto.convert2FeatureDtos(features);
-    }
-
-    /**
-     * 分页使用，datatable获取相应type的feature某页数据
-     *
-     * @param params
-     * @param user
-     * @return
-     */
-    public DataTable<FeatureDto> getPageFeatureListByTye(String params, Feature parent, User user) {
-        DataTable<FeatureDto> result = new DataTable<FeatureDto>();
-        DataTableParameter parameter = DataTableUtils.getDataTableParameterByJsonParam(params);
-        int start = parameter.getiDisplayStart();
-        int pageSize = parameter.getiDisplayLength();
-        int pageNo = (start / pageSize) + 1;
-        Criteria criteria = this.createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        Company company = user.getCompany();
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("isValid", 1)).add(Restrictions.eq("parent", parent));
-        Page page = pagedQuery(criteria, pageNo, pageSize);
-        List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos((List<Feature>) page.getResult());
-        result.setAaData(featureDtos);
-        result.setiTotalDisplayRecords((int) page.getTotalCount());
-        result.setiTotalRecords((int) page.getTotalCount());
-        result.setsEcho(parameter.getsEcho());
-        return result;
-
-
-    }
-
-    /**
-     * 获取层次结构列表,增加缓存
-     *
-     * @param type
-     * @param company
-     * @return
-     */
-    @Cacheable(value = "getOrgList")
-    public String getOrgList(Integer type, Company company) {
-        List<OrgDto> orgDtos = new ArrayList<OrgDto>();
-        List<Feature> features = this.getRootFeatures(type);
-        for (Feature feature : features) {
-            orgDtos.add(this.getChildrenByParentId(feature.getId(), company));
-        }
-        String jsonStr = null;
-        try {
-            jsonStr = new JsonMapper().toJson(orgDtos);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return jsonStr;
-    }
-
-    //    @Cacheable(value = "getChildrenByParentId", key = "#id")
-    public OrgDto getChildrenByParentId(Long id, Company company) {
-        if (id == null) {
-            return null;
-        }
-        Feature feature = getFeatureById(id);
-        if (feature == null) {
-            return null;
-        }
-        //创建OrgDto节点
-        OrgDto orgDto = new OrgDto();
-        orgDto.setId(id); //保存ID信息
-        orgDto.setName(feature.getFeatureName());
-        if (feature.getParent() != null) {
-            orgDto.setParentId(feature.getParent().getId());
-        }
-        List<Feature> departments = this.getActiveChildrenOrgs(feature, company);
-        for (Feature fea : departments) {
-            orgDto.getChildren().add(this.getChildrenByParentId(fea.getId(), company));
-        }
-        return orgDto;
-    }
-
-    //    @Cacheable(value = "getActiveChildrenOrgs", key = "#department.getId()")
-    private List<Feature> getActiveChildrenOrgs(Feature department, Company company) {
-        List<Feature> features = new ArrayList<Feature>();
-        for (Feature feature : department.getChildren()) {
-            if (feature.isValid() == 1 && feature.getCompany().getId().equals(company.getId())) {
-                features.add(feature);
-            }
-        }
-        return features;
-    }
-
-
-    public List<Feature> getRootFeatures(Integer type) {
-        List<Feature> features = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("type", type)).add(Restrictions.isNull("parent"));
-            features = criteria.list();
-        } catch (Exception e) {
-            return Collections.emptyList();
-        }
-        return features;
-
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param company 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByCompany", key = "#company.getId()")
-    public List<Feature> getFeaturesByCompany(Company company) {
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-        criteria.add(Restrictions.eq("company", company));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-
-        for (Feature f : features) {
-            f.getChildren().toString();
-            f.getOwner().toString();
-            if (f.getParent() != null)
-                f.getParent().toString();
-        }
-        return features;
-    }
-
-    /**
-     * 根据组织结构的id获取叶子节点
-     ***重要：**已更改为包含本节点****
-     * @param type
-     * @param feature
-     * @return
-     */
-    public List<Feature> getLeafByParentId(Integer type, Feature feature) {
-        if (feature == null || feature.isValid() == 0) return Collections.emptyList();
-        List<Feature> features = new ArrayList<Feature>();
-        if (CollectionUtils.isEmpty(feature.getChildren())) {
-            features.add(feature);
-            return features;
-        }
-        List<Feature> children = feature.getChildren();
-        boolean flag = false;
-        for (Feature child : children) {
-            if (child.isValid() == 1) {
-                flag = true;
-                features.addAll(getLeafByParentId(type, child));
-            }
-        }
-//        if (!flag) {//没有有效的子节点
-            features.add(feature);
-//        }
-        return features;
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java b/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
deleted file mode 100644
index a706a36..0000000
--- a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package com.casic.accessControl.feature.web;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.Role;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.CompanyManager;
-import com.casic.accessControl.user.manager.UserManager;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.StringUtils;
-import com.casic.accessControl.xls.Common;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import sun.org.mozilla.javascript.internal.EcmaError;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.IOException;
-import java.util.*;
-
-/**
- * 提供http访问接口
- * Created by lenovo on 2016/5/16.
- */
-@Controller
-@RequestMapping(value = "feature")
-public class FeatureController {
-    @Autowired
-    private FeatureManager featureManager;
-    @Autowired
-    private UserManager userManager;
-    @Autowired
-    private CompanyManager companyManager;
-
-    @RequestMapping(value = "org-list")
-    @ResponseBody
-    public String getOrgList(@RequestParam(required = true) Integer type, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Company company = user.getCompany();
-        return featureManager.getOrgList(type, company);
-    }
-
-    @RequestMapping(value = "org-list-na")
-    @ResponseBody
-    public Map<String, String> getOrgListNa(@RequestParam Long userId) {//na端所有传过来的userid都是公司id
-        Map<String, String> res = new HashMap<String, String>();
-        res.put("message", "列表获取失败");
-        try {
-//            User user = userManager.getUserById(userId);//获取当前登录用户
-//            Company company = user.getCompany();
-            Company company = companyManager.getCompanyById(userId);
-            String areas = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.AREA.getIndex(), company);
-            String lines = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.LINE.getIndex(), company);
-            res.put("feature", areas);
-            res.put("line", lines);
-        } catch (Exception e) {
-            return res;
-        }
-        res.put("message", "成功获取");
-        return res;
-    }
-
-    @RequestMapping(value = "getFeature")
-    @ResponseBody
-    public Map<String, Object> getFeaturesByUser(@RequestParam(required = true) Integer type, HttpSession session) {
-
-        Map<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        List<FeatureDto> list = featureManager.getFeaturesByUser(type, user);
-        if (list == null) {//获取列表失败
-            result.put("message", "获取列表出现错误");
-            return result;
-        } else {
-            result.put("data", list);
-            result.put("message", "获取列表成功");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "getSubFeatureList")
-    public void getSubFeatureList(@RequestParam(required = true) String jsonParams, @RequestParam(required = false) Long parentId, HttpServletResponse response, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Feature parent = featureManager.getFeatureById(parentId);
-        DataTable<FeatureDto> dtoDataTable = featureManager.getPageFeatureListByTye(jsonParams, parent, user);
-        Gson gson = new Gson();
-        String json = gson.toJson(dtoDataTable);
-        response.setCharacterEncoding("utf-8");
-        try {
-            response.getWriter().write(json);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @RequestMapping(value = "delete")
-    @ResponseBody
-    public Map<String, Object> deleteFeatureById(@RequestParam(required = true) Long id, HttpSession session) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        try {
-            String res = featureManager.invalidFeature(id.toString());
-            if (StringUtils.isBlank(res)) {
-                result.put("message", "删除失败");
-            } else {
-                result.put("message", "删除成功");
-                result.put("success", true);
-            }
-        } catch (Exception e) {
-            result.put("message", "删除失败");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "save")
-    @ResponseBody
-    public Map<String, Object> save(@RequestParam(required = true) String params, HttpSession session) {
-        Gson gson = new Gson();
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        Map markers = gson.fromJson(params, HashMap.class);
-        String featureName = (String) markers.get("featureName");
-        String memo = (String) markers.get("memo") == null ? "" : (String) markers.get("memo");
-        Long parentId = Long.valueOf(StringUtils.isBlank((String) markers.get("parentId")) ? "-1" : (String) markers.get("parentId"));//不知为什么转过来为Double
-        Long id = Long.valueOf(StringUtils.isBlank((String) markers.get("id")) ? "-1" : (String) markers.get("id"));
-
-
-        if (StringUtils.isBlank(featureName) || parentId.equals(-1L)) {
-            result.put("message", "必要参数未传送");
-            return result;
-        }
-        Feature feature = new Feature();
-        feature.setValid(1);
-        Feature parent = featureManager.getFeatureById(parentId);
-        feature.setParent(parent);
-        feature.setFeatureName(featureName);
-        feature.setMemo(memo);
-        feature.setOwner(user);
-        feature.setCompany(user.getCompany());
-        feature.setType(parent.getType());
-        if (!id.equals(-1L)) {
-            feature.setId(id);
-        }
-        try {
-            featureManager.saveOrupdateFeature(feature, user);
-            result.put("message", "保存成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "保存失败");
-        }
-        return result;
-
-    }
-
-
-    @RequestMapping(value = "getFeatureById")
-    @ResponseBody
-    public Map<String, Object> getFeatureById(@RequestParam(required = true) Long id) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        try {
-            FeatureDto feature = featureManager.getFeatureDtoById(id);
-            result.put("data", feature);
-            result.put("message", "获取成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "获取失败");
-        }
-        return result;
-
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
index 08a290e..3f53635 100644
--- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
+++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
@@ -1,6 +1,6 @@
 package com.casic.accessControl.marker.dto;
 
-import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.domain.Feature;
 import com.casic.accessControl.marker.domain.Marker;
 import org.apache.commons.collections.CollectionUtils;
 
diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
index 080b291..7fe7434 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -4,8 +4,6 @@
 import com.casic.accessControl.core.hibernate.HibernateEntityDao;
 import com.casic.accessControl.core.page.Page;
 import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.user.domain.Company;
@@ -49,9 +47,6 @@
 public class MarkerManager extends HibernateEntityDao<Marker> {
 
     @Resource
-    private FeatureManager featureManager;
-
-    @Resource
     private UserManager userInfoManager;
 
 
@@ -154,33 +149,33 @@
 
     //获取marker
 //    @Cacheable(value = "getMarkerByFeature", key = "#feature.getId()")
-    public List<Marker> getMarkerByFeature(Feature feature) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            criteria.add(Restrictions.eq("belongLine", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            criteria.add(Restrictions.eq("belongLine", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
-    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
-            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
+//            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
     public boolean saveMarker(Marker marker) {
         try {
@@ -465,7 +460,7 @@
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setLayStyle(sheet.getCell(indexMap.get("layStyle"), i).getContents());
-                } else if(recordTypeFlag == 4) {
+                } else if (recordTypeFlag == 4) {
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setBelowType(sheet.getCell(indexMap.get("belowType"), i).getContents());
diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
index a19f2f5..7675e1f 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -2,9 +2,6 @@
 
 import com.casic.accessControl.core.ext.export.CsvExportor;
 import com.casic.accessControl.core.ext.export.TableModel;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.manager.MarkerManager;
diff --git a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java b/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
deleted file mode 100644
index e69de29..0000000
--- a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
+++ /dev/null
diff --git a/src/main/java/com/casic/accessControl/rs/FeatureResource.java b/src/main/java/com/casic/accessControl/rs/FeatureResource.java
index 68aeb97..e97f18b 100644
--- a/src/main/java/com/casic/accessControl/rs/FeatureResource.java
+++ b/src/main/java/com/casic/accessControl/rs/FeatureResource.java
@@ -1,65 +1,65 @@
-package com.casic.accessControl.rs;
-
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.UserManager;
-import com.google.gson.Gson;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import javax.annotation.Resource;
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
-* Created by admin on 2015/1/15.
-*/
-@Component
-@Path("feature")
-public class FeatureResource
-{
-    private static Logger logger = LoggerFactory.getLogger(FeatureResource.class);
-
-    @Resource
-    private UserManager userManager;
-
-    @Resource
-    private FeatureManager featureManager;
-
-    @GET
-    @Path("get")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map get(@QueryParam("userName") String userName ){
-        Map map = new HashMap<String, Object>();
-        try {
-            User user = userManager.getUserByName(userName);
-            if (user == null) {
-                map.put("success", "false");
-                map.put("message", "人员不存在！");
-                return map;
-            }
-            Company company = user.getCompany();
-            if (company!=null)
-            {
-                List<Feature> features = featureManager.getFeaturesByCompany(company);
-                List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos(features);
-                map.put("success", "true");
-                map.put("message", featureDtos);
-            }
-        }
-        catch (Exception e)
-        {
-            map.put("success", "false");
-            map.put("message", e.getMessage());
-        }
-        return  map;
-    }
-}
+//package com.casic.accessControl.rs;
+//
+//import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.dto.FeatureDto;
+//import com.casic.accessControl.feature.manager.FeatureManager;
+//import com.casic.accessControl.user.domain.Company;
+//import com.casic.accessControl.user.domain.User;
+//import com.casic.accessControl.user.manager.UserManager;
+//import com.google.gson.Gson;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.stereotype.Component;
+//import org.springframework.web.bind.annotation.RequestParam;
+//
+//import javax.annotation.Resource;
+//import javax.ws.rs.*;
+//import javax.ws.rs.core.MediaType;
+//import java.util.HashMap;
+//import java.util.List;
+//import java.util.Map;
+//
+///**
+//* Created by admin on 2015/1/15.
+//*/
+//@Component
+//@Path("feature")
+//public class FeatureResource
+//{
+//    private static Logger logger = LoggerFactory.getLogger(FeatureResource.class);
+//
+//    @Resource
+//    private UserManager userManager;
+//
+//    @Resource
+//    private FeatureManager featureManager;
+//
+//    @GET
+//    @Path("get")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public Map get(@QueryParam("userName") String userName ){
+//        Map map = new HashMap<String, Object>();
+//        try {
+//            User user = userManager.getUserByName(userName);
+//            if (user == null) {
+//                map.put("success", "false");
+//                map.put("message", "人员不存在！");
+//                return map;
+//            }
+//            Company company = user.getCompany();
+//            if (company!=null)
+//            {
+//                List<Feature> features = featureManager.getFeaturesByCompany(company);
+//                List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos(features);
+//                map.put("success", "true");
+//                map.put("message", featureDtos);
+//            }
+//        }
+//        catch (Exception e)
+//        {
+//            map.put("success", "false");
+//            map.put("message", e.getMessage());
+//        }
+//        return  map;
+//    }
+//}
diff --git a/src/main/java/com/casic/accessControl/rs/MapInfo.java b/src/main/java/com/casic/accessControl/rs/MapInfo.java
deleted file mode 100644
index a77fce9..0000000
--- a/src/main/java/com/casic/accessControl/rs/MapInfo.java
+++ /dev/null
@@ -1,131 +0,0 @@
-//package com.casic.accessControl.rs;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-///**
-// * Created by admin on 2015/8/26.
-// */
-//public class MapInfo {
-//
-//    private String mapUrl;
-//
-//    private String updateTime;
-//
-//    private String uploader;
-//
-//    private String name;
-//
-//    private String uuid;
-//
-//    private String site;
-//    /*
-//    0:草稿
-//    1：待审核
-//    2：通过
-//    3: 驳回
-//     */
-//    private String status;
-//
-//    //
-//    private int id;
-//
-//
-//    public String getMapUrl()
-//    {
-//        return mapUrl;
-//    }
-//
-//    public void setMapUrl(String mapUrl)
-//    {
-//        this.mapUrl = mapUrl;
-//    }
-//
-//    public String getUpdateTime()
-//    {
-//        return updateTime;
-//    }
-//
-//    public void setUpdateTime(String updateTime)
-//    {
-//        this.updateTime = updateTime;
-//    }
-//
-//    public String getUploader()
-//    {
-//        return uploader;
-//    }
-//
-//    public void setUploader(String uploader)
-//    {
-//        this.uploader = uploader;
-//    }
-//
-//    public String getName()
-//    {
-//        return name;
-//    }
-//
-//    public void setName(String name)
-//    {
-//        this.name = name;
-//    }
-//
-//    public String getUuid()
-//    {
-//        return uuid;
-//    }
-//
-//    public void setUuid(String uuid)
-//    {
-//        this.uuid = uuid;
-//    }
-//
-//    public String getSite()
-//    {
-//        return site;
-//    }
-//
-//    public void setSite(String site)
-//    {
-//        this.site = site;
-//    }
-//
-//    public String getStatus()
-//    {
-//        return status;
-//    }
-//
-//    public void setStatus(String status)
-//    {
-//        this.status = status;
-//    }
-//
-//    public int getId()
-//    {
-//        return id;
-//    }
-//
-//    public void setId(int id)
-//    {
-//        this.id = id;
-//    }
-//
-//    public static List<MapInfo> getMockerMaps()
-//    {
-//        List<MapInfo> maps = new ArrayList<MapInfo>();
-//        for (int i = 0; i < 20; i++)
-//        {
-//            MapInfo map = new MapInfo();
-//            map.setId(i);
-//            map.setUploader("张帆");
-//            map.setMapUrl("http://192.168.0.111:9080/accessControl/logo.jpg");
-//            map.setSite("永旺路"+i);
-//            map.setUpdateTime("2015-08-02");
-//            map.setStatus("待审核");
-//            maps.add(map);
-//        }
-//        return maps;
-//
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/rs/MarkResource.java b/src/main/java/com/casic/accessControl/rs/MarkResource.java
index 8ae4d85..cef1580 100644
--- a/src/main/java/com/casic/accessControl/rs/MarkResource.java
+++ b/src/main/java/com/casic/accessControl/rs/MarkResource.java
@@ -1,7 +1,7 @@
 package com.casic.accessControl.rs;
 
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
+//import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.manager.MarkerManager;
 import com.casic.accessControl.user.domain.Company;
@@ -35,8 +35,8 @@
     @Resource
     private MarkerManager markerManager;
 
-    @Resource
-    private FeatureManager featureManager;
+//    @Resource
+//    private FeatureManager featureManager;
 
     @GET
     @Path("post")
diff --git a/src/main/java/com/casic/accessControl/rs/UserObj.java b/src/main/java/com/casic/accessControl/rs/UserObj.java
deleted file mode 100644
index c0fe651..0000000
--- a/src/main/java/com/casic/accessControl/rs/UserObj.java
+++ /dev/null
@@ -1,61 +0,0 @@
-//package com.casic.accessControl.rs;
-//
-//import java.io.Serializable;
-//
-///**
-// * Created by admin on 2015/10/9.
-// */
-//public class UserObj implements Serializable {
-//    private String userName;
-//    private String password;
-//    private String appId;
-//    /*
-//    roles:��ɫ֮���Զ��ŷָ�
-//     */
-//    private String roles;
-//
-//    /*
-//    authorities:Ȩ��֮���Զ��ŷָ�
-//    */
-//    private String authorities;
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public String getPassword() {
-//        return password;
-//    }
-//
-//    public void setPassword(String password) {
-//        this.password = password;
-//    }
-//
-//    public String getAppId() {
-//        return appId;
-//    }
-//
-//    public void setAppId(String appId) {
-//        this.appId = appId;
-//    }
-//
-//    public String getRoles() {
-//        return roles;
-//    }
-//
-//    public void setRoles(String roles) {
-//        this.roles = roles;
-//    }
-//
-//    public String getAuthorities() {
-//        return authorities;
-//    }
-//
-//    public void setAuthorities(String authorities) {
-//        this.authorities = authorities;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java b/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java
deleted file mode 100644
index ac60ed5..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java
+++ /dev/null
@@ -1,65 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//import org.geotools.referencing.operation.transform.NADCONTransform;
-//
-//import javax.persistence.*;
-//
-///**
-// * Created by test203 on 2015/10/29.
-// */
-//@Entity
-//@Table(name = "ZX_DATABASE_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_DATABASE_INFO_ID", sequenceName = "SEQ_ZX_DATABASE_INFO_ID", allocationSize = 1, initialValue = 1)
-//public class DataBaseInfo {
-//    private Long id;
-//    private String account;
-//    private String password;
-//    private String sid;
-//    private String owner;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_ZX_DATABASE_INFO_ID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "ACCOUNT", nullable = false)
-//    public String getAccount() {
-//        return account;
-//    }
-//
-//    public void setAccount(String account) {
-//        this.account = account;
-//    }
-//
-//    @Column(name = "PASSWORD", nullable = false)
-//    public String getPassword() {
-//        return password;
-//    }
-//
-//    public void setPassword(String password) {
-//        this.password = password;
-//    }
-//
-//    @Column(name = "SID", nullable = false)
-//    public String getSid() {
-//        return sid;
-//    }
-//
-//    public void setSid(String sid) {
-//        this.sid = sid;
-//    }
-//
-//    @Column(name = "OWNER", nullable = false)
-//    public String getOwner() {
-//        return owner;
-//    }
-//
-//    public void setOwner(String owner) {
-//        this.owner = owner;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java b/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java
deleted file mode 100644
index 9578060..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java
+++ /dev/null
@@ -1,77 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//import com.casic.accessControl.org.domain.UserInfo;
-//
-//import javax.persistence.*;
-//import java.util.Date;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Entity
-//@Table(name = "ZX_ORCL_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_ORCL_INFO_ID",sequenceName = "SEQ_ZX_ORCL_INFO_ID",allocationSize = 1,initialValue = 1)
-//public class OrclInfo {
-//    private Long id;
-//    private String fileName;
-//    private String filePath;
-//    private String memo;
-//    private Date bkDay = new Date();
-//    private UserInfo userInfo;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE,generator = "SEQ_ZX_ORCL_INFO_ID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "FILE_NAME",nullable = false)
-//    public String getFileName() {
-//        return fileName;
-//    }
-//
-//    public void setFileName(String fileName) {
-//        this.fileName = fileName;
-//    }
-//
-//    @Column(name = "FILE_PATH",nullable = false)
-//    public String getFilePath() {
-//        return filePath;
-//    }
-//
-//    public void setFilePath(String filePath) {
-//        this.filePath = filePath;
-//    }
-//
-//    @Column(name = "MEMO")
-//    public String getMemo() {
-//        return memo;
-//    }
-//
-//    public void setMemo(String memo) {
-//        this.memo = memo;
-//    }
-//
-//    @Column(name = "BK_DAY")
-//    public Date getBkDay() {
-//        return bkDay;
-//    }
-//
-//    public void setBkDay(Date bkDay) {
-//        this.bkDay = bkDay;
-//    }
-//
-//    @ManyToOne(fetch = FetchType.LAZY)
-//    @JoinColumn(name = "USER_ID")
-//    public UserInfo getUserInfo() {
-//        return userInfo;
-//    }
-//
-//    public void setUserInfo(UserInfo userInfo) {
-//        this.userInfo = userInfo;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/SysLogInfo.java b/src/main/java/com/casic/accessControl/sys/domain/SysLogInfo.java
deleted file mode 100644
index 60e5583..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/SysLogInfo.java
+++ /dev/null
@@ -1,70 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//
-//import com.casic.accessControl.user.domain.UserInfo;
-//
-//import javax.persistence.*;
-//import java.io.Serializable;
-//import java.util.Date;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Entity
-//@Table(name = "ZX_SYS_LOG_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_SYS_LOG_ID",sequenceName = "SEQ_ZX_SYS_LOG_ID",allocationSize = 1,initialValue = 1)
-//public class SysLogInfo implements Serializable{
-//    private Long id;
-//    private String logType;//系统日志、运行日志、操作日志
-//    private String msg;
-//    private Date logDay = new Date();
-//    private UserInfo user;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE,generator = "SEQ_ZX_SYS_LOG_ID")
-//    @Column(name = "DBID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "LOG_TYPE",nullable = false)
-//    public String getLogType() {
-//        return logType;
-//    }
-//
-//    public void setLogType(String logType) {
-//        this.logType = logType;
-//    }
-//
-//    @Column(name = "LOG_MSG",nullable = false)
-//    public String getMsg() {
-//        return msg;
-//    }
-//
-//    public void setMsg(String msg) {
-//        this.msg = msg;
-//    }
-//
-//    @Column(name = "LOG_DAY")
-//    public Date getLogDay() {
-//        return logDay;
-//    }
-//
-//    public void setLogDay(Date logDay) {
-//        this.logDay = logDay;
-//    }
-//
-//    @ManyToOne(fetch = FetchType.LAZY)
-//    @JoinColumn(name = "USER_ID")
-//    public UserInfo getUser() {
-//        return user;
-//    }
-//
-//    public void setUser(UserInfo user) {
-//        this.user = user;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/dto/ExcelInfoDTO.java b/src/main/java/com/casic/accessControl/sys/dto/ExcelInfoDTO.java
deleted file mode 100644
index 2fe496e..0000000
--- a/src/main/java/com/casic/accessControl/sys/dto/ExcelInfoDTO.java
+++ /dev/null
@@ -1,77 +0,0 @@
-//package com.casic.accessControl.sys.dto;
-//
-//import com.casic.accessControl.sys.domain.SysLogInfo;
-//import com.casic.accessControl.util.DateUtils;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-///**
-// * Created by test203 on 2015/10/23.
-// */
-//public class ExcelInfoDTO {
-//    private String logType;//系统日志、运行日志、操作日志
-//    private String msg;
-//    private String logDay;
-//    private String userName;
-//
-//    public String getLogType() {
-//        return logType;
-//    }
-//
-//    public void setLogType(String logType) {
-//        this.logType = logType;
-//    }
-//
-//    public String getMsg() {
-//        return msg;
-//    }
-//
-//    public void setMsg(String msg) {
-//        this.msg = msg;
-//    }
-//
-//    public String getLogDay() {
-//        return logDay;
-//    }
-//
-//    public void setLogDay(String logDay) {
-//        this.logDay = logDay;
-//    }
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public static ExcelInfoDTO ConvertToDTO(SysLogInfo logInfo){
-//        if(null!=logInfo){
-//            ExcelInfoDTO dto = new ExcelInfoDTO();
-//            dto.setLogType(logInfo.getLogType());
-//            if(null!=logInfo.getLogDay()){
-//                dto.setLogDay(DateUtils.sdf2.format(logInfo.getLogDay()));
-//            }else {
-//                dto.setLogDay(" ");
-//            }
-//            dto.setMsg(logInfo.getMsg());
-//            if(null!=logInfo.getUser()){
-//                dto.setUserName(logInfo.getUser().getUserName());
-//            }else {
-//                dto.setUserName(" ");
-//            }
-//            return dto;
-//        }
-//        return new ExcelInfoDTO();
-//    }
-//
-//    public static List<ExcelInfoDTO> ConvertToDTO(List<SysLogInfo> list){
-//        List<ExcelInfoDTO> dtoList = new ArrayList<ExcelInfoDTO>();
-//        for(SysLogInfo log : list){
-//            dtoList.add(ConvertToDTO(log));
-//        }
-//        return dtoList;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/dto/OrclInfoDTO.java b/src/main/java/com/casic/accessControl/sys/dto/OrclInfoDTO.java
deleted file mode 100644
index 46a261d..0000000
--- a/src/main/java/com/casic/accessControl/sys/dto/OrclInfoDTO.java
+++ /dev/null
@@ -1,124 +0,0 @@
-//package com.casic.accessControl.sys.dto;
-//
-//import com.casic.accessControl.org.domain.UserInfo;
-//import com.casic.accessControl.shp.domain.LayerInfo;
-//import com.casic.accessControl.sys.domain.OrclInfo;
-//import com.casic.accessControl.util.DateUtils;
-//
-//import java.util.ArrayList;
-//import java.util.Date;
-//import java.util.List;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//public class OrclInfoDTO {
-//    private Long id;
-//    private String fileName;
-//    private String filePath;
-//    private String memo;
-//    private String bkDay;
-//    private Long userId;
-//    private String userName;
-//    private String btnRestor = "<a href='#' class='btn mini blue'>还原</a>";
-//    private String btnDelete = "<a href='#' class='btn mini red'>删除</a>";
-//
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    public String getFileName() {
-//        return fileName;
-//    }
-//
-//    public void setFileName(String fileName) {
-//        this.fileName = fileName;
-//    }
-//
-//    public String getFilePath() {
-//        return filePath;
-//    }
-//
-//    public void setFilePath(String filePath) {
-//        this.filePath = filePath;
-//    }
-//
-//    public String getMemo() {
-//        return memo;
-//    }
-//
-//    public void setMemo(String memo) {
-//        this.memo = memo;
-//    }
-//
-//    public String getBkDay() {
-//        return bkDay;
-//    }
-//
-//    public void setBkDay(String bkDay) {
-//        this.bkDay = bkDay;
-//    }
-//
-//    public Long getUserId() {
-//        return userId;
-//    }
-//
-//    public void setUserId(Long userId) {
-//        this.userId = userId;
-//    }
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public String getBtnRestor() {
-//        return btnRestor;
-//    }
-//
-//    public void setBtnRestor(String btnRestor) {
-//        this.btnRestor = btnRestor;
-//    }
-//
-//    public String getBtnDelete() {
-//        return btnDelete;
-//    }
-//
-//    public void setBtnDelete(String btnDelete) {
-//        this.btnDelete = btnDelete;
-//    }
-//
-//    public static OrclInfoDTO ConvertToDTO(OrclInfo orcl){
-//        if(null!=orcl){
-//            OrclInfoDTO dto = new OrclInfoDTO();
-//            dto.setId(orcl.getId());
-//            dto.setFileName(orcl.getFileName());
-//            dto.setFilePath(orcl.getFilePath());
-//            dto.setMemo(orcl.getMemo());
-//            if(null!=orcl.getBkDay()){
-//                dto.setBkDay(DateUtils.sdf1.format(orcl.getBkDay()));
-//            }
-//            if(null!=orcl.getUserInfo()){
-//                dto.setUserId(orcl.getUserInfo().getId());
-//                dto.setUserName(orcl.getUserInfo().getUsername());
-//            }
-//            return dto;
-//        }
-//        return new OrclInfoDTO();
-//    }
-//
-//    public static List<OrclInfoDTO> ConvertToDTO(List<OrclInfo> list){
-//        List<OrclInfoDTO> dtoList = new ArrayList<OrclInfoDTO>();
-//        for(OrclInfo orcl : list){
-//            dtoList.add(ConvertToDTO(orcl));
-//        }
-//        return dtoList;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/dto/SysLogInfoDTO.java b/src/main/java/com/casic/accessControl/sys/dto/SysLogInfoDTO.java
deleted file mode 100644
index 64d6c39..0000000
--- a/src/main/java/com/casic/accessControl/sys/dto/SysLogInfoDTO.java
+++ /dev/null
@@ -1,103 +0,0 @@
-//package com.casic.accessControl.sys.dto;
-//
-//import com.casic.accessControl.sys.domain.SysLogInfo;
-//import com.casic.accessControl.util.DateUtils;
-//
-//import java.util.ArrayList;
-//import java.util.Date;
-//import java.util.List;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//public class SysLogInfoDTO {
-//    private Long id;
-//    private String logType;//系统日志、运行日志、操作日志
-//    private String msg;
-//    private String logDay;
-//    private Long userId;
-//    private String userName;
-//    private String btn = "<a href='#' class='btn mini blue'>查看</a>";
-//
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    public String getLogType() {
-//        return logType;
-//    }
-//
-//    public void setLogType(String logType) {
-//        this.logType = logType;
-//    }
-//
-//    public String getMsg() {
-//        return msg;
-//    }
-//
-//    public void setMsg(String msg) {
-//        this.msg = msg;
-//    }
-//
-//    public String getLogDay() {
-//        return logDay;
-//    }
-//
-//    public void setLogDay(String logDay) {
-//        this.logDay = logDay;
-//    }
-//
-//    public Long getUserId() {
-//        return userId;
-//    }
-//
-//    public void setUserId(Long userId) {
-//        this.userId = userId;
-//    }
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public String getBtn() {
-//        return btn;
-//    }
-//
-//    public void setBtn(String btn) {
-//        this.btn = btn;
-//    }
-//
-//    public static SysLogInfoDTO ConvertToDTO(SysLogInfo log){
-//        if(null!=log){
-//            SysLogInfoDTO dto = new SysLogInfoDTO();
-//            dto.setId(log.getId());
-//            dto.setLogType(log.getLogType());
-//            if(null!=log.getLogDay()){
-//                dto.setLogDay(DateUtils.sdf2.format(log.getLogDay()));
-//            }
-//            dto.setMsg(log.getMsg());
-//            if(null!=log.getUser()){
-//                dto.setUserId(log.getUser().getId());
-//                dto.setUserName(log.getUser().getUserName());
-//            }
-//            return dto;
-//        }
-//        return new SysLogInfoDTO();
-//    }
-//
-//    public static List<SysLogInfoDTO> ConvertToDTO(List<SysLogInfo> list){
-//        List<SysLogInfoDTO> dtoList = new ArrayList<SysLogInfoDTO>();
-//        for(SysLogInfo log : list){
-//            dtoList.add(ConvertToDTO(log));
-//        }
-//        return dtoList;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/manager/DataBaseInfoManager.java b/src/main/java/com/casic/accessControl/sys/manager/DataBaseInfoManager.java
deleted file mode 100644
index b1395e6..0000000
--- a/src/main/java/com/casic/accessControl/sys/manager/DataBaseInfoManager.java
+++ /dev/null
@@ -1,19 +0,0 @@
-//package com.casic.accessControl.sys.manager;
-//
-//import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-//import com.casic.accessControl.sys.domain.DataBaseInfo;
-//import org.hibernate.Criteria;
-//import org.springframework.stereotype.Service;
-//
-///**
-// * Created by test203 on 2015/10/29.
-// */
-//@Service
-//public class DataBaseInfoManager extends HibernateEntityDao<DataBaseInfo>{
-//    public Criteria getCriteria(){
-//        return  getSession().createCriteria(DataBaseInfo.class);
-//    }
-//    public Object getDataBaseInfo(){
-//        return getCriteria().uniqueResult();
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/manager/OrclInfoManager.java b/src/main/java/com/casic/accessControl/sys/manager/OrclInfoManager.java
deleted file mode 100644
index d9804a1..0000000
--- a/src/main/java/com/casic/accessControl/sys/manager/OrclInfoManager.java
+++ /dev/null
@@ -1,127 +0,0 @@
-//package com.casic.accessControl.sys.manager;
-//
-//import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-//import com.casic.accessControl.core.page.Page;
-//import com.casic.accessControl.sys.domain.DataBaseInfo;
-//import com.casic.accessControl.sys.domain.OrclInfo;
-//import com.casic.accessControl.sys.dto.OrclInfoDTO;
-//import com.casic.accessControl.util.*;
-//import org.hibernate.Criteria;
-//import org.hibernate.criterion.Order;
-//import org.hibernate.criterion.Restrictions;
-//import org.springframework.jdbc.core.JdbcTemplate;
-//import org.springframework.stereotype.Service;
-//
-//import javax.annotation.Resource;
-//import java.io.File;
-//import java.io.IOException;
-//import java.text.ParseException;
-//import java.util.*;
-//
-///**
-//* Created by Administrator on 2015/8/17.
-//*/
-//@Service
-//public class OrclInfoManager extends HibernateEntityDao<OrclInfo> {
-//    @Resource
-//    private DataBaseInfoManager dataBaseInfoManager;
-//
-//    public void setDataBaseInfoManager(DataBaseInfoManager dataBaseInfoManager) {
-//        this.dataBaseInfoManager = dataBaseInfoManager;
-//    }
-//
-//    public Criteria getCriteria() {
-//        return getSession().createCriteria(OrclInfo.class);
-//    }
-//
-//    public DataTable<OrclInfoDTO> pageQueryOrclInfoDTO(String jsonParam, String beginDay, String endDay) throws ParseException {
-//        DataTableParameter dataTableParam = DataTableUtils.getDataTableParameterByJsonParam(jsonParam);
-//
-//        int start = dataTableParam.getiDisplayStart();
-//        int pageSize = dataTableParam.getiDisplayLength();
-//        int pageNo = (start / pageSize) + 1;
-//
-//        Criteria criteria = getCriteria();
-//        criteria.addOrder(Order.desc("id"));
-//
-//        if (StringUtils.isNotBlank(beginDay)) {
-//            criteria.add(Restrictions.ge("bkDay", DateUtils.sdf1.parse(beginDay)));
-//        }
-//        if (StringUtils.isNotBlank(endDay)) {
-//            Date date = DateUtils.sdf1.parse(endDay);
-//            Calendar calendar = Calendar.getInstance();
-//            calendar.setTime(date);
-//            calendar.add(Calendar.DATE, 1);
-//            criteria.add(Restrictions.le("bkDay", calendar.getTime()));
-//        }
-//
-//        Page page = pagedQuery(criteria, pageNo, pageSize);
-//
-//        List<OrclInfoDTO> dtoList = OrclInfoDTO.ConvertToDTO((List<OrclInfo>) page.getResult());
-//        DataTable<OrclInfoDTO> dt = new DataTable<OrclInfoDTO>();
-//        dt.setAaData(dtoList);
-//        dt.setiTotalDisplayRecords((int) page.getTotalCount());
-//        dt.setsEcho(dataTableParam.getsEcho());
-//        dt.setiTotalRecords((int) page.getTotalCount());
-//        return dt;
-//    }
-//
-//    public Map<String, Object> backupDB(String memo, String path) throws IOException, InterruptedException {
-//        Map<String, Object> map = new HashMap<String, Object>();
-//        DataBaseInfo db = (DataBaseInfo) dataBaseInfoManager.getDataBaseInfo();
-//        if (null == db) {
-//            map.put("success", false);
-//            map.put("message", "没有找到数据库配置！");
-//            return map;
-//        }
-//        String fileName = db.getSid() + DateUtils.sdfFile.format(new Date()) + ".dmp";
-//        String filePath = path + "\\" + fileName;
-//
-//        DataBaseUtils.doExp(db.getAccount(), db.getPassword(), db.getSid(), db.getOwner(), filePath);
-//
-//        OrclInfo orcl = new OrclInfo();
-//        orcl.setMemo(memo);
-//        orcl.setFileName(fileName);
-//        orcl.setFilePath(filePath);
-//        save(orcl);
-//
-//        map.put("success", true);
-//        return map;
-//    }
-//
-//    private String dropTables() {
-//        StringBuilder tables = new StringBuilder();
-//        JdbcTemplate jdbcTemplate = getJdbcTemplate();
-//        String sqlString = "SELECT TABLE_NAME FROM USER_TABLES WHERE TABLESPACE_NAME='USERS'";
-//        List<String> list = jdbcTemplate.queryForList(sqlString, java.lang.String.class);
-//        if (list.size() > 0) {
-//            for (String t : list) {
-//                tables.append(t).append(",");
-//                String sql = "DROP TABLE " + t + " CASCADE CONSTRAINTS";
-//                jdbcTemplate.execute(sql);
-//                System.out.println(sql);
-//            }
-//            return tables.deleteCharAt(tables.length() - 1).toString();
-//        }
-//        return "";
-//    }
-//
-//    public void doImp(Long id) throws IOException, InterruptedException {
-//        OrclInfoDTO dto = getDTO(id);
-//        if (StringUtils.isNotBlank(dto.getFilePath())) {
-//            String tbl = dropTables();
-//            DataBaseUtils.doImp("scott", "xxfw", "XXFW", dto.getFilePath(), tbl);
-//        }
-//    }
-//
-//    public OrclInfoDTO getDTO(Long id) {
-//        return OrclInfoDTO.ConvertToDTO(get(id));
-//    }
-//
-//    public void deleteDTO(Long id) {
-//        OrclInfo orcl = get(id);
-//        File file = new File(orcl.getFilePath());
-//        file.delete();
-//        remove(orcl);
-//    }
-//}

diff --git a/src/main/java/com/casic/accessControl/feature/domain/Feature.java b/src/main/java/com/casic/accessControl/feature/domain/Feature.java
deleted file mode 100644
index c89a0c2..0000000
--- a/src/main/java/com/casic/accessControl/feature/domain/Feature.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.casic.accessControl.feature.domain;
-
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-
-import javax.persistence.*;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-//点的信息
-@Entity
-@Table(name = "feature")
-public class Feature {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private Long id;
-    @Column(name = "longitude")
-    private Double longitude;
-    @Column(name = "latitude")
-    private Double latitude;
-    @Column(name = "featureName")
-    private String featureName;
-    @Column(name = "type")
-    private int type;
-    @Column(name = "isValid")
-    private Integer isValid;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "parent")
-    private Feature parent;
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "parent")
-    private List<Feature> children;
-    @Column(name = "memo")
-    private String memo;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "owner", referencedColumnName = "id")
-    private User owner;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "company", referencedColumnName = "id")
-    private Company company;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer isValid() {
-        return isValid;
-    }
-
-    public void setValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public Feature getParent() {
-        return parent;
-    }
-
-    public void setParent(Feature parent) {
-        this.parent = parent;
-    }
-
-    public List<Feature> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<Feature> children) {
-        this.children = children;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public User getOwner() {
-        return owner;
-    }
-
-    public void setOwner(User owner) {
-        this.owner = owner;
-    }
-
-    public Company getCompany() {
-        return company;
-    }
-
-    public void setCompany(Company company) {
-        this.company = company;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java b/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
deleted file mode 100644
index 256f261..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import com.casic.accessControl.feature.domain.Feature;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/17.
- */
-public class FeatureDto {
-    private Long id;
-    private Double longitude;
-    private Double latitude;
-    private String featureName;
-    private int type;
-    private Integer isValid;
-    private String memo;
-    private Long parentId;
-
-    private String btnEdit = "<a href='#' class='btn mini blue'><i class='icon-edit'></i>编辑</a>";
-    private String btnDelete = "<a href='#' class='btn mini red'><i class='icon-trash'></i>删除</a>";
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer getIsValid() {
-        return isValid;
-    }
-
-    public void setIsValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public Long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getBtnEdit() {
-        return btnEdit;
-    }
-
-    public void setBtnEdit(String btnEdit) {
-        this.btnEdit = btnEdit;
-    }
-
-    public String getBtnDelete() {
-        return btnDelete;
-    }
-
-    public void setBtnDelete(String btnDelete) {
-        this.btnDelete = btnDelete;
-    }
-
-    public static FeatureDto convert2FeatureDto(Feature feature) {
-        if (feature == null) {
-            return null;
-        }
-        FeatureDto featureDto = new FeatureDto();
-        featureDto.setId(feature.getId());
-        featureDto.setFeatureName(feature.getFeatureName());
-        featureDto.setIsValid(feature.isValid());
-        featureDto.setLatitude(feature.getLatitude());
-        featureDto.setLongitude(feature.getLongitude());
-        featureDto.setMemo(feature.getMemo());
-        featureDto.setType(feature.getType());
-        if (feature.getParent() != null)
-            featureDto.setParentId(feature.getParent().getId());
-        return featureDto;
-    }
-
-    public static List<FeatureDto> convert2FeatureDtos(List<Feature> features) {
-        List<FeatureDto> featureDtos = new ArrayList<FeatureDto>();
-        for (Feature feature : features) {
-            featureDtos.add(convert2FeatureDto(feature));
-        }
-        return featureDtos;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java b/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
deleted file mode 100644
index 785dcba..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/19.
- */
-public class OrgDto {
-    private long id;
-
-    private String name;
-
-    private long parentId;
-
-    private List<OrgDto> children = new ArrayList<OrgDto>();
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(long parentId) {
-        this.parentId = parentId;
-    }
-
-    public List<OrgDto> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<OrgDto> children) {
-        this.children = children;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java b/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
deleted file mode 100644
index a475e21..0000000
--- a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
+++ /dev/null
@@ -1,316 +0,0 @@
-package com.casic.accessControl.feature.manager;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.core.page.Page;
-import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.marker.manager.MarkerManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.DataTableParameter;
-import com.casic.accessControl.util.DataTableUtils;
-import org.apache.commons.collections.CollectionUtils;
-import org.hibernate.Criteria;
-import org.hibernate.Query;
-import org.hibernate.criterion.Restrictions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.jdbc.object.SqlQuery;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-@Service
-public class FeatureManager extends HibernateEntityDao<Feature> {
-
-    private Logger logger = LoggerFactory.getLogger(this.getClass());
-    @Resource
-    private MarkerManager markerManager;
-
-
-    public Feature getFeatureById(Long id) {
-        Feature feature = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("id", id)).add(Restrictions.eq("isValid", 1));
-            feature = (Feature) criteria.list().get(0);
-        } catch (Exception e) {
-            return null;
-        }
-        return feature;
-    }
-
-    public FeatureDto getFeatureDtoById(Long id) {
-        return FeatureDto.convert2FeatureDto(getFeatureById(id));
-    }
-
-    /**
-     * 根据id，软删除某个点或线或片
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param ids 多个id
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public String invalidFeature(String ids) {
-        if (StringUtils.isBlank(ids) || ids.indexOf(")") != -1) {//未传入值，直接返回，防止无效查询,过滤非法请求，防止sql注入
-            return "";
-        }
-        String[] idsArr = ids.split(",");
-        StringBuilder canDeleteIds = new StringBuilder("");
-        StringBuilder cantDeleleIds = new StringBuilder("");
-        //找出能删除的和不能删除的id组合
-        for (String id : idsArr) {
-            Long longId = Long.valueOf(id);
-            if (this.isCanDelete(longId)) {
-                if (canDeleteIds.length() > 0) {
-                    canDeleteIds.append(",");
-                }
-                canDeleteIds.append(id);
-
-            } else {
-                if (cantDeleleIds.length() > 0) {
-                    cantDeleleIds.append(",");
-                }
-                cantDeleleIds.append(id);
-            }
-        }
-
-        String temp1Ids = canDeleteIds.toString();
-        String temp2Ids = cantDeleleIds.toString();
-        if (StringUtils.isNotBlank(temp2Ids)) {//有不能删除的，都不删除
-            return "";
-        }
-        Query query = this.getSession().createQuery("update Feature f set f.isValid = 0 where id in (" + temp1Ids + ")");
-        query.executeUpdate();
-
-        return "success";
-    }
-
-    /**
-     * 判断feature是否可以删除
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param id
-     * @return
-     */
-    private boolean isCanDelete(Long id) {
-        Feature feature = this.getFeatureById(id);
-        if (feature.getParent() == null) {//所有用户共用的根节点不能删除
-            return false;
-        }
-        if (CollectionUtils.isNotEmpty(feature.getChildren())) {
-            for (Feature child : feature.getChildren()) {
-                if (child.isValid() == 1) {
-                    return false;
-                }
-            }
-
-        }
-        List<Marker> markers = markerManager.getMarkerByFeature(feature);
-        if (CollectionUtils.isNotEmpty(markers)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * 将数据库中的feature信息按照参数更新
-     *
-     * @param feature
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public void saveOrupdateFeature(Feature feature, User user) {
-        this.getSession().saveOrUpdate(feature);
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param user 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByUser")
-    public List<FeatureDto> getFeaturesByUser(Integer type, User user) {
-        if (user == null) {
-            return Collections.emptyList();
-        }
-        Company company = user.getCompany();
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("type", type));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-        return FeatureDto.convert2FeatureDtos(features);
-    }
-
-    /**
-     * 分页使用，datatable获取相应type的feature某页数据
-     *
-     * @param params
-     * @param user
-     * @return
-     */
-    public DataTable<FeatureDto> getPageFeatureListByTye(String params, Feature parent, User user) {
-        DataTable<FeatureDto> result = new DataTable<FeatureDto>();
-        DataTableParameter parameter = DataTableUtils.getDataTableParameterByJsonParam(params);
-        int start = parameter.getiDisplayStart();
-        int pageSize = parameter.getiDisplayLength();
-        int pageNo = (start / pageSize) + 1;
-        Criteria criteria = this.createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        Company company = user.getCompany();
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("isValid", 1)).add(Restrictions.eq("parent", parent));
-        Page page = pagedQuery(criteria, pageNo, pageSize);
-        List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos((List<Feature>) page.getResult());
-        result.setAaData(featureDtos);
-        result.setiTotalDisplayRecords((int) page.getTotalCount());
-        result.setiTotalRecords((int) page.getTotalCount());
-        result.setsEcho(parameter.getsEcho());
-        return result;
-
-
-    }
-
-    /**
-     * 获取层次结构列表,增加缓存
-     *
-     * @param type
-     * @param company
-     * @return
-     */
-    @Cacheable(value = "getOrgList")
-    public String getOrgList(Integer type, Company company) {
-        List<OrgDto> orgDtos = new ArrayList<OrgDto>();
-        List<Feature> features = this.getRootFeatures(type);
-        for (Feature feature : features) {
-            orgDtos.add(this.getChildrenByParentId(feature.getId(), company));
-        }
-        String jsonStr = null;
-        try {
-            jsonStr = new JsonMapper().toJson(orgDtos);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return jsonStr;
-    }
-
-    //    @Cacheable(value = "getChildrenByParentId", key = "#id")
-    public OrgDto getChildrenByParentId(Long id, Company company) {
-        if (id == null) {
-            return null;
-        }
-        Feature feature = getFeatureById(id);
-        if (feature == null) {
-            return null;
-        }
-        //创建OrgDto节点
-        OrgDto orgDto = new OrgDto();
-        orgDto.setId(id); //保存ID信息
-        orgDto.setName(feature.getFeatureName());
-        if (feature.getParent() != null) {
-            orgDto.setParentId(feature.getParent().getId());
-        }
-        List<Feature> departments = this.getActiveChildrenOrgs(feature, company);
-        for (Feature fea : departments) {
-            orgDto.getChildren().add(this.getChildrenByParentId(fea.getId(), company));
-        }
-        return orgDto;
-    }
-
-    //    @Cacheable(value = "getActiveChildrenOrgs", key = "#department.getId()")
-    private List<Feature> getActiveChildrenOrgs(Feature department, Company company) {
-        List<Feature> features = new ArrayList<Feature>();
-        for (Feature feature : department.getChildren()) {
-            if (feature.isValid() == 1 && feature.getCompany().getId().equals(company.getId())) {
-                features.add(feature);
-            }
-        }
-        return features;
-    }
-
-
-    public List<Feature> getRootFeatures(Integer type) {
-        List<Feature> features = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("type", type)).add(Restrictions.isNull("parent"));
-            features = criteria.list();
-        } catch (Exception e) {
-            return Collections.emptyList();
-        }
-        return features;
-
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param company 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByCompany", key = "#company.getId()")
-    public List<Feature> getFeaturesByCompany(Company company) {
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-        criteria.add(Restrictions.eq("company", company));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-
-        for (Feature f : features) {
-            f.getChildren().toString();
-            f.getOwner().toString();
-            if (f.getParent() != null)
-                f.getParent().toString();
-        }
-        return features;
-    }
-
-    /**
-     * 根据组织结构的id获取叶子节点
-     ***重要：**已更改为包含本节点****
-     * @param type
-     * @param feature
-     * @return
-     */
-    public List<Feature> getLeafByParentId(Integer type, Feature feature) {
-        if (feature == null || feature.isValid() == 0) return Collections.emptyList();
-        List<Feature> features = new ArrayList<Feature>();
-        if (CollectionUtils.isEmpty(feature.getChildren())) {
-            features.add(feature);
-            return features;
-        }
-        List<Feature> children = feature.getChildren();
-        boolean flag = false;
-        for (Feature child : children) {
-            if (child.isValid() == 1) {
-                flag = true;
-                features.addAll(getLeafByParentId(type, child));
-            }
-        }
-//        if (!flag) {//没有有效的子节点
-            features.add(feature);
-//        }
-        return features;
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java b/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
deleted file mode 100644
index a706a36..0000000
--- a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package com.casic.accessControl.feature.web;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.Role;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.CompanyManager;
-import com.casic.accessControl.user.manager.UserManager;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.StringUtils;
-import com.casic.accessControl.xls.Common;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import sun.org.mozilla.javascript.internal.EcmaError;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.IOException;
-import java.util.*;
-
-/**
- * 提供http访问接口
- * Created by lenovo on 2016/5/16.
- */
-@Controller
-@RequestMapping(value = "feature")
-public class FeatureController {
-    @Autowired
-    private FeatureManager featureManager;
-    @Autowired
-    private UserManager userManager;
-    @Autowired
-    private CompanyManager companyManager;
-
-    @RequestMapping(value = "org-list")
-    @ResponseBody
-    public String getOrgList(@RequestParam(required = true) Integer type, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Company company = user.getCompany();
-        return featureManager.getOrgList(type, company);
-    }
-
-    @RequestMapping(value = "org-list-na")
-    @ResponseBody
-    public Map<String, String> getOrgListNa(@RequestParam Long userId) {//na端所有传过来的userid都是公司id
-        Map<String, String> res = new HashMap<String, String>();
-        res.put("message", "列表获取失败");
-        try {
-//            User user = userManager.getUserById(userId);//获取当前登录用户
-//            Company company = user.getCompany();
-            Company company = companyManager.getCompanyById(userId);
-            String areas = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.AREA.getIndex(), company);
-            String lines = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.LINE.getIndex(), company);
-            res.put("feature", areas);
-            res.put("line", lines);
-        } catch (Exception e) {
-            return res;
-        }
-        res.put("message", "成功获取");
-        return res;
-    }
-
-    @RequestMapping(value = "getFeature")
-    @ResponseBody
-    public Map<String, Object> getFeaturesByUser(@RequestParam(required = true) Integer type, HttpSession session) {
-
-        Map<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        List<FeatureDto> list = featureManager.getFeaturesByUser(type, user);
-        if (list == null) {//获取列表失败
-            result.put("message", "获取列表出现错误");
-            return result;
-        } else {
-            result.put("data", list);
-            result.put("message", "获取列表成功");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "getSubFeatureList")
-    public void getSubFeatureList(@RequestParam(required = true) String jsonParams, @RequestParam(required = false) Long parentId, HttpServletResponse response, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Feature parent = featureManager.getFeatureById(parentId);
-        DataTable<FeatureDto> dtoDataTable = featureManager.getPageFeatureListByTye(jsonParams, parent, user);
-        Gson gson = new Gson();
-        String json = gson.toJson(dtoDataTable);
-        response.setCharacterEncoding("utf-8");
-        try {
-            response.getWriter().write(json);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @RequestMapping(value = "delete")
-    @ResponseBody
-    public Map<String, Object> deleteFeatureById(@RequestParam(required = true) Long id, HttpSession session) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        try {
-            String res = featureManager.invalidFeature(id.toString());
-            if (StringUtils.isBlank(res)) {
-                result.put("message", "删除失败");
-            } else {
-                result.put("message", "删除成功");
-                result.put("success", true);
-            }
-        } catch (Exception e) {
-            result.put("message", "删除失败");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "save")
-    @ResponseBody
-    public Map<String, Object> save(@RequestParam(required = true) String params, HttpSession session) {
-        Gson gson = new Gson();
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        Map markers = gson.fromJson(params, HashMap.class);
-        String featureName = (String) markers.get("featureName");
-        String memo = (String) markers.get("memo") == null ? "" : (String) markers.get("memo");
-        Long parentId = Long.valueOf(StringUtils.isBlank((String) markers.get("parentId")) ? "-1" : (String) markers.get("parentId"));//不知为什么转过来为Double
-        Long id = Long.valueOf(StringUtils.isBlank((String) markers.get("id")) ? "-1" : (String) markers.get("id"));
-
-
-        if (StringUtils.isBlank(featureName) || parentId.equals(-1L)) {
-            result.put("message", "必要参数未传送");
-            return result;
-        }
-        Feature feature = new Feature();
-        feature.setValid(1);
-        Feature parent = featureManager.getFeatureById(parentId);
-        feature.setParent(parent);
-        feature.setFeatureName(featureName);
-        feature.setMemo(memo);
-        feature.setOwner(user);
-        feature.setCompany(user.getCompany());
-        feature.setType(parent.getType());
-        if (!id.equals(-1L)) {
-            feature.setId(id);
-        }
-        try {
-            featureManager.saveOrupdateFeature(feature, user);
-            result.put("message", "保存成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "保存失败");
-        }
-        return result;
-
-    }
-
-
-    @RequestMapping(value = "getFeatureById")
-    @ResponseBody
-    public Map<String, Object> getFeatureById(@RequestParam(required = true) Long id) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        try {
-            FeatureDto feature = featureManager.getFeatureDtoById(id);
-            result.put("data", feature);
-            result.put("message", "获取成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "获取失败");
-        }
-        return result;
-
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
index 08a290e..3f53635 100644
--- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
+++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
@@ -1,6 +1,6 @@
 package com.casic.accessControl.marker.dto;
 
-import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.domain.Feature;
 import com.casic.accessControl.marker.domain.Marker;
 import org.apache.commons.collections.CollectionUtils;
 
diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
index 080b291..7fe7434 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -4,8 +4,6 @@
 import com.casic.accessControl.core.hibernate.HibernateEntityDao;
 import com.casic.accessControl.core.page.Page;
 import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.user.domain.Company;
@@ -49,9 +47,6 @@
 public class MarkerManager extends HibernateEntityDao<Marker> {
 
     @Resource
-    private FeatureManager featureManager;
-
-    @Resource
     private UserManager userInfoManager;
 
 
@@ -154,33 +149,33 @@
 
     //获取marker
 //    @Cacheable(value = "getMarkerByFeature", key = "#feature.getId()")
-    public List<Marker> getMarkerByFeature(Feature feature) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            criteria.add(Restrictions.eq("belongLine", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            criteria.add(Restrictions.eq("belongLine", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
-    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
-            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
+//            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
     public boolean saveMarker(Marker marker) {
         try {
@@ -465,7 +460,7 @@
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setLayStyle(sheet.getCell(indexMap.get("layStyle"), i).getContents());
-                } else if(recordTypeFlag == 4) {
+                } else if (recordTypeFlag == 4) {
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setBelowType(sheet.getCell(indexMap.get("belowType"), i).getContents());
diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
index a19f2f5..7675e1f 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -2,9 +2,6 @@
 
 import com.casic.accessControl.core.ext.export.CsvExportor;
 import com.casic.accessControl.core.ext.export.TableModel;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.manager.MarkerManager;
diff --git a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java b/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
deleted file mode 100644
index e69de29..0000000
--- a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
+++ /dev/null
diff --git a/src/main/java/com/casic/accessControl/rs/FeatureResource.java b/src/main/java/com/casic/accessControl/rs/FeatureResource.java
index 68aeb97..e97f18b 100644
--- a/src/main/java/com/casic/accessControl/rs/FeatureResource.java
+++ b/src/main/java/com/casic/accessControl/rs/FeatureResource.java
@@ -1,65 +1,65 @@
-package com.casic.accessControl.rs;
-
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.UserManager;
-import com.google.gson.Gson;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import javax.annotation.Resource;
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
-* Created by admin on 2015/1/15.
-*/
-@Component
-@Path("feature")
-public class FeatureResource
-{
-    private static Logger logger = LoggerFactory.getLogger(FeatureResource.class);
-
-    @Resource
-    private UserManager userManager;
-
-    @Resource
-    private FeatureManager featureManager;
-
-    @GET
-    @Path("get")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map get(@QueryParam("userName") String userName ){
-        Map map = new HashMap<String, Object>();
-        try {
-            User user = userManager.getUserByName(userName);
-            if (user == null) {
-                map.put("success", "false");
-                map.put("message", "人员不存在！");
-                return map;
-            }
-            Company company = user.getCompany();
-            if (company!=null)
-            {
-                List<Feature> features = featureManager.getFeaturesByCompany(company);
-                List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos(features);
-                map.put("success", "true");
-                map.put("message", featureDtos);
-            }
-        }
-        catch (Exception e)
-        {
-            map.put("success", "false");
-            map.put("message", e.getMessage());
-        }
-        return  map;
-    }
-}
+//package com.casic.accessControl.rs;
+//
+//import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.dto.FeatureDto;
+//import com.casic.accessControl.feature.manager.FeatureManager;
+//import com.casic.accessControl.user.domain.Company;
+//import com.casic.accessControl.user.domain.User;
+//import com.casic.accessControl.user.manager.UserManager;
+//import com.google.gson.Gson;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.stereotype.Component;
+//import org.springframework.web.bind.annotation.RequestParam;
+//
+//import javax.annotation.Resource;
+//import javax.ws.rs.*;
+//import javax.ws.rs.core.MediaType;
+//import java.util.HashMap;
+//import java.util.List;
+//import java.util.Map;
+//
+///**
+//* Created by admin on 2015/1/15.
+//*/
+//@Component
+//@Path("feature")
+//public class FeatureResource
+//{
+//    private static Logger logger = LoggerFactory.getLogger(FeatureResource.class);
+//
+//    @Resource
+//    private UserManager userManager;
+//
+//    @Resource
+//    private FeatureManager featureManager;
+//
+//    @GET
+//    @Path("get")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public Map get(@QueryParam("userName") String userName ){
+//        Map map = new HashMap<String, Object>();
+//        try {
+//            User user = userManager.getUserByName(userName);
+//            if (user == null) {
+//                map.put("success", "false");
+//                map.put("message", "人员不存在！");
+//                return map;
+//            }
+//            Company company = user.getCompany();
+//            if (company!=null)
+//            {
+//                List<Feature> features = featureManager.getFeaturesByCompany(company);
+//                List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos(features);
+//                map.put("success", "true");
+//                map.put("message", featureDtos);
+//            }
+//        }
+//        catch (Exception e)
+//        {
+//            map.put("success", "false");
+//            map.put("message", e.getMessage());
+//        }
+//        return  map;
+//    }
+//}
diff --git a/src/main/java/com/casic/accessControl/rs/MapInfo.java b/src/main/java/com/casic/accessControl/rs/MapInfo.java
deleted file mode 100644
index a77fce9..0000000
--- a/src/main/java/com/casic/accessControl/rs/MapInfo.java
+++ /dev/null
@@ -1,131 +0,0 @@
-//package com.casic.accessControl.rs;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-///**
-// * Created by admin on 2015/8/26.
-// */
-//public class MapInfo {
-//
-//    private String mapUrl;
-//
-//    private String updateTime;
-//
-//    private String uploader;
-//
-//    private String name;
-//
-//    private String uuid;
-//
-//    private String site;
-//    /*
-//    0:草稿
-//    1：待审核
-//    2：通过
-//    3: 驳回
-//     */
-//    private String status;
-//
-//    //
-//    private int id;
-//
-//
-//    public String getMapUrl()
-//    {
-//        return mapUrl;
-//    }
-//
-//    public void setMapUrl(String mapUrl)
-//    {
-//        this.mapUrl = mapUrl;
-//    }
-//
-//    public String getUpdateTime()
-//    {
-//        return updateTime;
-//    }
-//
-//    public void setUpdateTime(String updateTime)
-//    {
-//        this.updateTime = updateTime;
-//    }
-//
-//    public String getUploader()
-//    {
-//        return uploader;
-//    }
-//
-//    public void setUploader(String uploader)
-//    {
-//        this.uploader = uploader;
-//    }
-//
-//    public String getName()
-//    {
-//        return name;
-//    }
-//
-//    public void setName(String name)
-//    {
-//        this.name = name;
-//    }
-//
-//    public String getUuid()
-//    {
-//        return uuid;
-//    }
-//
-//    public void setUuid(String uuid)
-//    {
-//        this.uuid = uuid;
-//    }
-//
-//    public String getSite()
-//    {
-//        return site;
-//    }
-//
-//    public void setSite(String site)
-//    {
-//        this.site = site;
-//    }
-//
-//    public String getStatus()
-//    {
-//        return status;
-//    }
-//
-//    public void setStatus(String status)
-//    {
-//        this.status = status;
-//    }
-//
-//    public int getId()
-//    {
-//        return id;
-//    }
-//
-//    public void setId(int id)
-//    {
-//        this.id = id;
-//    }
-//
-//    public static List<MapInfo> getMockerMaps()
-//    {
-//        List<MapInfo> maps = new ArrayList<MapInfo>();
-//        for (int i = 0; i < 20; i++)
-//        {
-//            MapInfo map = new MapInfo();
-//            map.setId(i);
-//            map.setUploader("张帆");
-//            map.setMapUrl("http://192.168.0.111:9080/accessControl/logo.jpg");
-//            map.setSite("永旺路"+i);
-//            map.setUpdateTime("2015-08-02");
-//            map.setStatus("待审核");
-//            maps.add(map);
-//        }
-//        return maps;
-//
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/rs/MarkResource.java b/src/main/java/com/casic/accessControl/rs/MarkResource.java
index 8ae4d85..cef1580 100644
--- a/src/main/java/com/casic/accessControl/rs/MarkResource.java
+++ b/src/main/java/com/casic/accessControl/rs/MarkResource.java
@@ -1,7 +1,7 @@
 package com.casic.accessControl.rs;
 
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
+//import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.manager.MarkerManager;
 import com.casic.accessControl.user.domain.Company;
@@ -35,8 +35,8 @@
     @Resource
     private MarkerManager markerManager;
 
-    @Resource
-    private FeatureManager featureManager;
+//    @Resource
+//    private FeatureManager featureManager;
 
     @GET
     @Path("post")
diff --git a/src/main/java/com/casic/accessControl/rs/UserObj.java b/src/main/java/com/casic/accessControl/rs/UserObj.java
deleted file mode 100644
index c0fe651..0000000
--- a/src/main/java/com/casic/accessControl/rs/UserObj.java
+++ /dev/null
@@ -1,61 +0,0 @@
-//package com.casic.accessControl.rs;
-//
-//import java.io.Serializable;
-//
-///**
-// * Created by admin on 2015/10/9.
-// */
-//public class UserObj implements Serializable {
-//    private String userName;
-//    private String password;
-//    private String appId;
-//    /*
-//    roles:��ɫ֮���Զ��ŷָ�
-//     */
-//    private String roles;
-//
-//    /*
-//    authorities:Ȩ��֮���Զ��ŷָ�
-//    */
-//    private String authorities;
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public String getPassword() {
-//        return password;
-//    }
-//
-//    public void setPassword(String password) {
-//        this.password = password;
-//    }
-//
-//    public String getAppId() {
-//        return appId;
-//    }
-//
-//    public void setAppId(String appId) {
-//        this.appId = appId;
-//    }
-//
-//    public String getRoles() {
-//        return roles;
-//    }
-//
-//    public void setRoles(String roles) {
-//        this.roles = roles;
-//    }
-//
-//    public String getAuthorities() {
-//        return authorities;
-//    }
-//
-//    public void setAuthorities(String authorities) {
-//        this.authorities = authorities;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java b/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java
deleted file mode 100644
index ac60ed5..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java
+++ /dev/null
@@ -1,65 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//import org.geotools.referencing.operation.transform.NADCONTransform;
-//
-//import javax.persistence.*;
-//
-///**
-// * Created by test203 on 2015/10/29.
-// */
-//@Entity
-//@Table(name = "ZX_DATABASE_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_DATABASE_INFO_ID", sequenceName = "SEQ_ZX_DATABASE_INFO_ID", allocationSize = 1, initialValue = 1)
-//public class DataBaseInfo {
-//    private Long id;
-//    private String account;
-//    private String password;
-//    private String sid;
-//    private String owner;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_ZX_DATABASE_INFO_ID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "ACCOUNT", nullable = false)
-//    public String getAccount() {
-//        return account;
-//    }
-//
-//    public void setAccount(String account) {
-//        this.account = account;
-//    }
-//
-//    @Column(name = "PASSWORD", nullable = false)
-//    public String getPassword() {
-//        return password;
-//    }
-//
-//    public void setPassword(String password) {
-//        this.password = password;
-//    }
-//
-//    @Column(name = "SID", nullable = false)
-//    public String getSid() {
-//        return sid;
-//    }
-//
-//    public void setSid(String sid) {
-//        this.sid = sid;
-//    }
-//
-//    @Column(name = "OWNER", nullable = false)
-//    public String getOwner() {
-//        return owner;
-//    }
-//
-//    public void setOwner(String owner) {
-//        this.owner = owner;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java b/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java
deleted file mode 100644
index 9578060..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java
+++ /dev/null
@@ -1,77 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//import com.casic.accessControl.org.domain.UserInfo;
-//
-//import javax.persistence.*;
-//import java.util.Date;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Entity
-//@Table(name = "ZX_ORCL_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_ORCL_INFO_ID",sequenceName = "SEQ_ZX_ORCL_INFO_ID",allocationSize = 1,initialValue = 1)
-//public class OrclInfo {
-//    private Long id;
-//    private String fileName;
-//    private String filePath;
-//    private String memo;
-//    private Date bkDay = new Date();
-//    private UserInfo userInfo;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE,generator = "SEQ_ZX_ORCL_INFO_ID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "FILE_NAME",nullable = false)
-//    public String getFileName() {
-//        return fileName;
-//    }
-//
-//    public void setFileName(String fileName) {
-//        this.fileName = fileName;
-//    }
-//
-//    @Column(name = "FILE_PATH",nullable = false)
-//    public String getFilePath() {
-//        return filePath;
-//    }
-//
-//    public void setFilePath(String filePath) {
-//        this.filePath = filePath;
-//    }
-//
-//    @Column(name = "MEMO")
-//    public String getMemo() {
-//        return memo;
-//    }
-//
-//    public void setMemo(String memo) {
-//        this.memo = memo;
-//    }
-//
-//    @Column(name = "BK_DAY")
-//    public Date getBkDay() {
-//        return bkDay;
-//    }
-//
-//    public void setBkDay(Date bkDay) {
-//        this.bkDay = bkDay;
-//    }
-//
-//    @ManyToOne(fetch = FetchType.LAZY)
-//    @JoinColumn(name = "USER_ID")
-//    public UserInfo getUserInfo() {
-//        return userInfo;
-//    }
-//
-//    public void setUserInfo(UserInfo userInfo) {
-//        this.userInfo = userInfo;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/SysLogInfo.java b/src/main/java/com/casic/accessControl/sys/domain/SysLogInfo.java
deleted file mode 100644
index 60e5583..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/SysLogInfo.java
+++ /dev/null
@@ -1,70 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//
-//import com.casic.accessControl.user.domain.UserInfo;
-//
-//import javax.persistence.*;
-//import java.io.Serializable;
-//import java.util.Date;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Entity
-//@Table(name = "ZX_SYS_LOG_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_SYS_LOG_ID",sequenceName = "SEQ_ZX_SYS_LOG_ID",allocationSize = 1,initialValue = 1)
-//public class SysLogInfo implements Serializable{
-//    private Long id;
-//    private String logType;//系统日志、运行日志、操作日志
-//    private String msg;
-//    private Date logDay = new Date();
-//    private UserInfo user;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE,generator = "SEQ_ZX_SYS_LOG_ID")
-//    @Column(name = "DBID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "LOG_TYPE",nullable = false)
-//    public String getLogType() {
-//        return logType;
-//    }
-//
-//    public void setLogType(String logType) {
-//        this.logType = logType;
-//    }
-//
-//    @Column(name = "LOG_MSG",nullable = false)
-//    public String getMsg() {
-//        return msg;
-//    }
-//
-//    public void setMsg(String msg) {
-//        this.msg = msg;
-//    }
-//
-//    @Column(name = "LOG_DAY")
-//    public Date getLogDay() {
-//        return logDay;
-//    }
-//
-//    public void setLogDay(Date logDay) {
-//        this.logDay = logDay;
-//    }
-//
-//    @ManyToOne(fetch = FetchType.LAZY)
-//    @JoinColumn(name = "USER_ID")
-//    public UserInfo getUser() {
-//        return user;
-//    }
-//
-//    public void setUser(UserInfo user) {
-//        this.user = user;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/dto/ExcelInfoDTO.java b/src/main/java/com/casic/accessControl/sys/dto/ExcelInfoDTO.java
deleted file mode 100644
index 2fe496e..0000000
--- a/src/main/java/com/casic/accessControl/sys/dto/ExcelInfoDTO.java
+++ /dev/null
@@ -1,77 +0,0 @@
-//package com.casic.accessControl.sys.dto;
-//
-//import com.casic.accessControl.sys.domain.SysLogInfo;
-//import com.casic.accessControl.util.DateUtils;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-///**
-// * Created by test203 on 2015/10/23.
-// */
-//public class ExcelInfoDTO {
-//    private String logType;//系统日志、运行日志、操作日志
-//    private String msg;
-//    private String logDay;
-//    private String userName;
-//
-//    public String getLogType() {
-//        return logType;
-//    }
-//
-//    public void setLogType(String logType) {
-//        this.logType = logType;
-//    }
-//
-//    public String getMsg() {
-//        return msg;
-//    }
-//
-//    public void setMsg(String msg) {
-//        this.msg = msg;
-//    }
-//
-//    public String getLogDay() {
-//        return logDay;
-//    }
-//
-//    public void setLogDay(String logDay) {
-//        this.logDay = logDay;
-//    }
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public static ExcelInfoDTO ConvertToDTO(SysLogInfo logInfo){
-//        if(null!=logInfo){
-//            ExcelInfoDTO dto = new ExcelInfoDTO();
-//            dto.setLogType(logInfo.getLogType());
-//            if(null!=logInfo.getLogDay()){
-//                dto.setLogDay(DateUtils.sdf2.format(logInfo.getLogDay()));
-//            }else {
-//                dto.setLogDay(" ");
-//            }
-//            dto.setMsg(logInfo.getMsg());
-//            if(null!=logInfo.getUser()){
-//                dto.setUserName(logInfo.getUser().getUserName());
-//            }else {
-//                dto.setUserName(" ");
-//            }
-//            return dto;
-//        }
-//        return new ExcelInfoDTO();
-//    }
-//
-//    public static List<ExcelInfoDTO> ConvertToDTO(List<SysLogInfo> list){
-//        List<ExcelInfoDTO> dtoList = new ArrayList<ExcelInfoDTO>();
-//        for(SysLogInfo log : list){
-//            dtoList.add(ConvertToDTO(log));
-//        }
-//        return dtoList;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/dto/OrclInfoDTO.java b/src/main/java/com/casic/accessControl/sys/dto/OrclInfoDTO.java
deleted file mode 100644
index 46a261d..0000000
--- a/src/main/java/com/casic/accessControl/sys/dto/OrclInfoDTO.java
+++ /dev/null
@@ -1,124 +0,0 @@
-//package com.casic.accessControl.sys.dto;
-//
-//import com.casic.accessControl.org.domain.UserInfo;
-//import com.casic.accessControl.shp.domain.LayerInfo;
-//import com.casic.accessControl.sys.domain.OrclInfo;
-//import com.casic.accessControl.util.DateUtils;
-//
-//import java.util.ArrayList;
-//import java.util.Date;
-//import java.util.List;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//public class OrclInfoDTO {
-//    private Long id;
-//    private String fileName;
-//    private String filePath;
-//    private String memo;
-//    private String bkDay;
-//    private Long userId;
-//    private String userName;
-//    private String btnRestor = "<a href='#' class='btn mini blue'>还原</a>";
-//    private String btnDelete = "<a href='#' class='btn mini red'>删除</a>";
-//
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    public String getFileName() {
-//        return fileName;
-//    }
-//
-//    public void setFileName(String fileName) {
-//        this.fileName = fileName;
-//    }
-//
-//    public String getFilePath() {
-//        return filePath;
-//    }
-//
-//    public void setFilePath(String filePath) {
-//        this.filePath = filePath;
-//    }
-//
-//    public String getMemo() {
-//        return memo;
-//    }
-//
-//    public void setMemo(String memo) {
-//        this.memo = memo;
-//    }
-//
-//    public String getBkDay() {
-//        return bkDay;
-//    }
-//
-//    public void setBkDay(String bkDay) {
-//        this.bkDay = bkDay;
-//    }
-//
-//    public Long getUserId() {
-//        return userId;
-//    }
-//
-//    public void setUserId(Long userId) {
-//        this.userId = userId;
-//    }
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public String getBtnRestor() {
-//        return btnRestor;
-//    }
-//
-//    public void setBtnRestor(String btnRestor) {
-//        this.btnRestor = btnRestor;
-//    }
-//
-//    public String getBtnDelete() {
-//        return btnDelete;
-//    }
-//
-//    public void setBtnDelete(String btnDelete) {
-//        this.btnDelete = btnDelete;
-//    }
-//
-//    public static OrclInfoDTO ConvertToDTO(OrclInfo orcl){
-//        if(null!=orcl){
-//            OrclInfoDTO dto = new OrclInfoDTO();
-//            dto.setId(orcl.getId());
-//            dto.setFileName(orcl.getFileName());
-//            dto.setFilePath(orcl.getFilePath());
-//            dto.setMemo(orcl.getMemo());
-//            if(null!=orcl.getBkDay()){
-//                dto.setBkDay(DateUtils.sdf1.format(orcl.getBkDay()));
-//            }
-//            if(null!=orcl.getUserInfo()){
-//                dto.setUserId(orcl.getUserInfo().getId());
-//                dto.setUserName(orcl.getUserInfo().getUsername());
-//            }
-//            return dto;
-//        }
-//        return new OrclInfoDTO();
-//    }
-//
-//    public static List<OrclInfoDTO> ConvertToDTO(List<OrclInfo> list){
-//        List<OrclInfoDTO> dtoList = new ArrayList<OrclInfoDTO>();
-//        for(OrclInfo orcl : list){
-//            dtoList.add(ConvertToDTO(orcl));
-//        }
-//        return dtoList;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/dto/SysLogInfoDTO.java b/src/main/java/com/casic/accessControl/sys/dto/SysLogInfoDTO.java
deleted file mode 100644
index 64d6c39..0000000
--- a/src/main/java/com/casic/accessControl/sys/dto/SysLogInfoDTO.java
+++ /dev/null
@@ -1,103 +0,0 @@
-//package com.casic.accessControl.sys.dto;
-//
-//import com.casic.accessControl.sys.domain.SysLogInfo;
-//import com.casic.accessControl.util.DateUtils;
-//
-//import java.util.ArrayList;
-//import java.util.Date;
-//import java.util.List;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//public class SysLogInfoDTO {
-//    private Long id;
-//    private String logType;//系统日志、运行日志、操作日志
-//    private String msg;
-//    private String logDay;
-//    private Long userId;
-//    private String userName;
-//    private String btn = "<a href='#' class='btn mini blue'>查看</a>";
-//
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    public String getLogType() {
-//        return logType;
-//    }
-//
-//    public void setLogType(String logType) {
-//        this.logType = logType;
-//    }
-//
-//    public String getMsg() {
-//        return msg;
-//    }
-//
-//    public void setMsg(String msg) {
-//        this.msg = msg;
-//    }
-//
-//    public String getLogDay() {
-//        return logDay;
-//    }
-//
-//    public void setLogDay(String logDay) {
-//        this.logDay = logDay;
-//    }
-//
-//    public Long getUserId() {
-//        return userId;
-//    }
-//
-//    public void setUserId(Long userId) {
-//        this.userId = userId;
-//    }
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public String getBtn() {
-//        return btn;
-//    }
-//
-//    public void setBtn(String btn) {
-//        this.btn = btn;
-//    }
-//
-//    public static SysLogInfoDTO ConvertToDTO(SysLogInfo log){
-//        if(null!=log){
-//            SysLogInfoDTO dto = new SysLogInfoDTO();
-//            dto.setId(log.getId());
-//            dto.setLogType(log.getLogType());
-//            if(null!=log.getLogDay()){
-//                dto.setLogDay(DateUtils.sdf2.format(log.getLogDay()));
-//            }
-//            dto.setMsg(log.getMsg());
-//            if(null!=log.getUser()){
-//                dto.setUserId(log.getUser().getId());
-//                dto.setUserName(log.getUser().getUserName());
-//            }
-//            return dto;
-//        }
-//        return new SysLogInfoDTO();
-//    }
-//
-//    public static List<SysLogInfoDTO> ConvertToDTO(List<SysLogInfo> list){
-//        List<SysLogInfoDTO> dtoList = new ArrayList<SysLogInfoDTO>();
-//        for(SysLogInfo log : list){
-//            dtoList.add(ConvertToDTO(log));
-//        }
-//        return dtoList;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/manager/DataBaseInfoManager.java b/src/main/java/com/casic/accessControl/sys/manager/DataBaseInfoManager.java
deleted file mode 100644
index b1395e6..0000000
--- a/src/main/java/com/casic/accessControl/sys/manager/DataBaseInfoManager.java
+++ /dev/null
@@ -1,19 +0,0 @@
-//package com.casic.accessControl.sys.manager;
-//
-//import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-//import com.casic.accessControl.sys.domain.DataBaseInfo;
-//import org.hibernate.Criteria;
-//import org.springframework.stereotype.Service;
-//
-///**
-// * Created by test203 on 2015/10/29.
-// */
-//@Service
-//public class DataBaseInfoManager extends HibernateEntityDao<DataBaseInfo>{
-//    public Criteria getCriteria(){
-//        return  getSession().createCriteria(DataBaseInfo.class);
-//    }
-//    public Object getDataBaseInfo(){
-//        return getCriteria().uniqueResult();
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/manager/OrclInfoManager.java b/src/main/java/com/casic/accessControl/sys/manager/OrclInfoManager.java
deleted file mode 100644
index d9804a1..0000000
--- a/src/main/java/com/casic/accessControl/sys/manager/OrclInfoManager.java
+++ /dev/null
@@ -1,127 +0,0 @@
-//package com.casic.accessControl.sys.manager;
-//
-//import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-//import com.casic.accessControl.core.page.Page;
-//import com.casic.accessControl.sys.domain.DataBaseInfo;
-//import com.casic.accessControl.sys.domain.OrclInfo;
-//import com.casic.accessControl.sys.dto.OrclInfoDTO;
-//import com.casic.accessControl.util.*;
-//import org.hibernate.Criteria;
-//import org.hibernate.criterion.Order;
-//import org.hibernate.criterion.Restrictions;
-//import org.springframework.jdbc.core.JdbcTemplate;
-//import org.springframework.stereotype.Service;
-//
-//import javax.annotation.Resource;
-//import java.io.File;
-//import java.io.IOException;
-//import java.text.ParseException;
-//import java.util.*;
-//
-///**
-//* Created by Administrator on 2015/8/17.
-//*/
-//@Service
-//public class OrclInfoManager extends HibernateEntityDao<OrclInfo> {
-//    @Resource
-//    private DataBaseInfoManager dataBaseInfoManager;
-//
-//    public void setDataBaseInfoManager(DataBaseInfoManager dataBaseInfoManager) {
-//        this.dataBaseInfoManager = dataBaseInfoManager;
-//    }
-//
-//    public Criteria getCriteria() {
-//        return getSession().createCriteria(OrclInfo.class);
-//    }
-//
-//    public DataTable<OrclInfoDTO> pageQueryOrclInfoDTO(String jsonParam, String beginDay, String endDay) throws ParseException {
-//        DataTableParameter dataTableParam = DataTableUtils.getDataTableParameterByJsonParam(jsonParam);
-//
-//        int start = dataTableParam.getiDisplayStart();
-//        int pageSize = dataTableParam.getiDisplayLength();
-//        int pageNo = (start / pageSize) + 1;
-//
-//        Criteria criteria = getCriteria();
-//        criteria.addOrder(Order.desc("id"));
-//
-//        if (StringUtils.isNotBlank(beginDay)) {
-//            criteria.add(Restrictions.ge("bkDay", DateUtils.sdf1.parse(beginDay)));
-//        }
-//        if (StringUtils.isNotBlank(endDay)) {
-//            Date date = DateUtils.sdf1.parse(endDay);
-//            Calendar calendar = Calendar.getInstance();
-//            calendar.setTime(date);
-//            calendar.add(Calendar.DATE, 1);
-//            criteria.add(Restrictions.le("bkDay", calendar.getTime()));
-//        }
-//
-//        Page page = pagedQuery(criteria, pageNo, pageSize);
-//
-//        List<OrclInfoDTO> dtoList = OrclInfoDTO.ConvertToDTO((List<OrclInfo>) page.getResult());
-//        DataTable<OrclInfoDTO> dt = new DataTable<OrclInfoDTO>();
-//        dt.setAaData(dtoList);
-//        dt.setiTotalDisplayRecords((int) page.getTotalCount());
-//        dt.setsEcho(dataTableParam.getsEcho());
-//        dt.setiTotalRecords((int) page.getTotalCount());
-//        return dt;
-//    }
-//
-//    public Map<String, Object> backupDB(String memo, String path) throws IOException, InterruptedException {
-//        Map<String, Object> map = new HashMap<String, Object>();
-//        DataBaseInfo db = (DataBaseInfo) dataBaseInfoManager.getDataBaseInfo();
-//        if (null == db) {
-//            map.put("success", false);
-//            map.put("message", "没有找到数据库配置！");
-//            return map;
-//        }
-//        String fileName = db.getSid() + DateUtils.sdfFile.format(new Date()) + ".dmp";
-//        String filePath = path + "\\" + fileName;
-//
-//        DataBaseUtils.doExp(db.getAccount(), db.getPassword(), db.getSid(), db.getOwner(), filePath);
-//
-//        OrclInfo orcl = new OrclInfo();
-//        orcl.setMemo(memo);
-//        orcl.setFileName(fileName);
-//        orcl.setFilePath(filePath);
-//        save(orcl);
-//
-//        map.put("success", true);
-//        return map;
-//    }
-//
-//    private String dropTables() {
-//        StringBuilder tables = new StringBuilder();
-//        JdbcTemplate jdbcTemplate = getJdbcTemplate();
-//        String sqlString = "SELECT TABLE_NAME FROM USER_TABLES WHERE TABLESPACE_NAME='USERS'";
-//        List<String> list = jdbcTemplate.queryForList(sqlString, java.lang.String.class);
-//        if (list.size() > 0) {
-//            for (String t : list) {
-//                tables.append(t).append(",");
-//                String sql = "DROP TABLE " + t + " CASCADE CONSTRAINTS";
-//                jdbcTemplate.execute(sql);
-//                System.out.println(sql);
-//            }
-//            return tables.deleteCharAt(tables.length() - 1).toString();
-//        }
-//        return "";
-//    }
-//
-//    public void doImp(Long id) throws IOException, InterruptedException {
-//        OrclInfoDTO dto = getDTO(id);
-//        if (StringUtils.isNotBlank(dto.getFilePath())) {
-//            String tbl = dropTables();
-//            DataBaseUtils.doImp("scott", "xxfw", "XXFW", dto.getFilePath(), tbl);
-//        }
-//    }
-//
-//    public OrclInfoDTO getDTO(Long id) {
-//        return OrclInfoDTO.ConvertToDTO(get(id));
-//    }
-//
-//    public void deleteDTO(Long id) {
-//        OrclInfo orcl = get(id);
-//        File file = new File(orcl.getFilePath());
-//        file.delete();
-//        remove(orcl);
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/manager/SysLogInfoManager.java b/src/main/java/com/casic/accessControl/sys/manager/SysLogInfoManager.java
deleted file mode 100644
index a2c83a4..0000000
--- a/src/main/java/com/casic/accessControl/sys/manager/SysLogInfoManager.java
+++ /dev/null
@@ -1,92 +0,0 @@
-//package com.casic.accessControl.sys.manager;
-//
-//
-//import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-//import com.casic.accessControl.core.page.Page;
-//import com.casic.accessControl.sys.domain.SysLogInfo;
-//import com.casic.accessControl.sys.dto.ExcelInfoDTO;
-//import com.casic.accessControl.sys.dto.SysLogInfoDTO;
-//import com.casic.accessControl.util.*;
-//import com.casic.accessControl.xls.ExportExcel;
-//import org.hibernate.Criteria;
-//import org.hibernate.criterion.Order;
-//import org.hibernate.criterion.Restrictions;
-//import org.springframework.stereotype.Service;
-//
-//import java.io.FileOutputStream;
-//import java.io.IOException;
-//import java.io.OutputStream;
-//import java.text.ParseException;
-//import java.util.*;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Service
-//public class SysLogInfoManager extends HibernateEntityDao<SysLogInfo> {
-//
-//    public Criteria getCriteria() {
-//        return getSession().createCriteria(SysLogInfo.class);
-//    }
-//
-//    public DataTable<SysLogInfoDTO> pageQueryLogInfoDTO(String jsonParam, String logType, String beginDay, String endDay) throws ParseException {
-//        DataTableParameter dataTableParam = DataTableUtils.getDataTableParameterByJsonParam(jsonParam);
-//
-//        int start = dataTableParam.getiDisplayStart();
-//        int pageSize = dataTableParam.getiDisplayLength();
-//        int pageNo = (start / pageSize) + 1;
-//
-//        Criteria criteria = getCriteria();
-//        criteria.addOrder(Order.desc("id"));
-//
-//        if (StringUtils.isNotBlank(logType)) {
-//            criteria.add(Restrictions.like("logType", "%" + logType + "%"));
-//        }
-//        if (StringUtils.isNotBlank(beginDay)) {
-//            criteria.add(Restrictions.ge("logDay", DateUtils.sdf1.parse(beginDay)));
-//        }
-//        if (StringUtils.isNotBlank(endDay)) {
-//            Date date = DateUtils.sdf1.parse(endDay);
-//            Calendar calendar = Calendar.getInstance();
-//            calendar.setTime(date);
-//            calendar.add(Calendar.DATE, 1);
-//            criteria.add(Restrictions.le("logDay", calendar.getTime()));
-//        }
-//
-//        Page page = pagedQuery(criteria, pageNo, pageSize);
-//
-//        List<SysLogInfoDTO> dtoList = SysLogInfoDTO.ConvertToDTO((List<SysLogInfo>) page.getResult());
-//        DataTable<SysLogInfoDTO> dt = new DataTable<SysLogInfoDTO>();
-//        dt.setAaData(dtoList);
-//        dt.setiTotalDisplayRecords((int) page.getTotalCount());
-//        dt.setsEcho(dataTableParam.getsEcho());
-//        dt.setiTotalRecords((int) page.getTotalCount());
-//        return dt;
-//    }
-//
-//    public SysLogInfoDTO getDTO(Long id) {
-//        return SysLogInfoDTO.ConvertToDTO(get(id));
-//    }
-//
-//    public Map<String, Object> expSysLogToExcel(String logType, String beginDay, String endDay, String path) throws ParseException, IOException {
-//        Map<String, Object> map = new HashMap<String, Object>();
-//        Criteria criteria = getCriteria();
-//        criteria.add(Restrictions.like("logType", "%" + logType + "%"));
-//        if (StringUtils.isNotBlank(beginDay)) {
-//            criteria.add(Restrictions.ge("logDay", DateUtils.sdf1.parse(beginDay)));
-//        }
-//        if (StringUtils.isNotBlank(endDay)) {
-//            Calendar calendar = Calendar.getInstance();
-//            calendar.setTime(DateUtils.sdf1.parse(endDay));
-//            calendar.add(Calendar.DATE, 1);
-//            criteria.add(Restrictions.le("logDay", calendar.getTime()));
-//        }
-//        List<ExcelInfoDTO> dtoList = ExcelInfoDTO.ConvertToDTO(criteria.list());
-//        String[] headers = {"日志类型", "日志内容", "日期", "操作人"};
-//        OutputStream out = new FileOutputStream(path);
-//        ExportExcel<ExcelInfoDTO> ex = new ExportExcel<ExcelInfoDTO>();
-//        ex.exportExcel(headers, dtoList, out);
-//        map.put("success", true);
-//        return map;
-//    }
-//}

diff --git a/src/main/java/com/casic/accessControl/feature/domain/Feature.java b/src/main/java/com/casic/accessControl/feature/domain/Feature.java
deleted file mode 100644
index c89a0c2..0000000
--- a/src/main/java/com/casic/accessControl/feature/domain/Feature.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.casic.accessControl.feature.domain;
-
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-
-import javax.persistence.*;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-//点的信息
-@Entity
-@Table(name = "feature")
-public class Feature {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private Long id;
-    @Column(name = "longitude")
-    private Double longitude;
-    @Column(name = "latitude")
-    private Double latitude;
-    @Column(name = "featureName")
-    private String featureName;
-    @Column(name = "type")
-    private int type;
-    @Column(name = "isValid")
-    private Integer isValid;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "parent")
-    private Feature parent;
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "parent")
-    private List<Feature> children;
-    @Column(name = "memo")
-    private String memo;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "owner", referencedColumnName = "id")
-    private User owner;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "company", referencedColumnName = "id")
-    private Company company;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer isValid() {
-        return isValid;
-    }
-
-    public void setValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public Feature getParent() {
-        return parent;
-    }
-
-    public void setParent(Feature parent) {
-        this.parent = parent;
-    }
-
-    public List<Feature> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<Feature> children) {
-        this.children = children;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public User getOwner() {
-        return owner;
-    }
-
-    public void setOwner(User owner) {
-        this.owner = owner;
-    }
-
-    public Company getCompany() {
-        return company;
-    }
-
-    public void setCompany(Company company) {
-        this.company = company;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java b/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
deleted file mode 100644
index 256f261..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import com.casic.accessControl.feature.domain.Feature;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/17.
- */
-public class FeatureDto {
-    private Long id;
-    private Double longitude;
-    private Double latitude;
-    private String featureName;
-    private int type;
-    private Integer isValid;
-    private String memo;
-    private Long parentId;
-
-    private String btnEdit = "<a href='#' class='btn mini blue'><i class='icon-edit'></i>编辑</a>";
-    private String btnDelete = "<a href='#' class='btn mini red'><i class='icon-trash'></i>删除</a>";
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer getIsValid() {
-        return isValid;
-    }
-
-    public void setIsValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public Long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getBtnEdit() {
-        return btnEdit;
-    }
-
-    public void setBtnEdit(String btnEdit) {
-        this.btnEdit = btnEdit;
-    }
-
-    public String getBtnDelete() {
-        return btnDelete;
-    }
-
-    public void setBtnDelete(String btnDelete) {
-        this.btnDelete = btnDelete;
-    }
-
-    public static FeatureDto convert2FeatureDto(Feature feature) {
-        if (feature == null) {
-            return null;
-        }
-        FeatureDto featureDto = new FeatureDto();
-        featureDto.setId(feature.getId());
-        featureDto.setFeatureName(feature.getFeatureName());
-        featureDto.setIsValid(feature.isValid());
-        featureDto.setLatitude(feature.getLatitude());
-        featureDto.setLongitude(feature.getLongitude());
-        featureDto.setMemo(feature.getMemo());
-        featureDto.setType(feature.getType());
-        if (feature.getParent() != null)
-            featureDto.setParentId(feature.getParent().getId());
-        return featureDto;
-    }
-
-    public static List<FeatureDto> convert2FeatureDtos(List<Feature> features) {
-        List<FeatureDto> featureDtos = new ArrayList<FeatureDto>();
-        for (Feature feature : features) {
-            featureDtos.add(convert2FeatureDto(feature));
-        }
-        return featureDtos;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java b/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
deleted file mode 100644
index 785dcba..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/19.
- */
-public class OrgDto {
-    private long id;
-
-    private String name;
-
-    private long parentId;
-
-    private List<OrgDto> children = new ArrayList<OrgDto>();
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(long parentId) {
-        this.parentId = parentId;
-    }
-
-    public List<OrgDto> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<OrgDto> children) {
-        this.children = children;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java b/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
deleted file mode 100644
index a475e21..0000000
--- a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
+++ /dev/null
@@ -1,316 +0,0 @@
-package com.casic.accessControl.feature.manager;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.core.page.Page;
-import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.marker.manager.MarkerManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.DataTableParameter;
-import com.casic.accessControl.util.DataTableUtils;
-import org.apache.commons.collections.CollectionUtils;
-import org.hibernate.Criteria;
-import org.hibernate.Query;
-import org.hibernate.criterion.Restrictions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.jdbc.object.SqlQuery;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-@Service
-public class FeatureManager extends HibernateEntityDao<Feature> {
-
-    private Logger logger = LoggerFactory.getLogger(this.getClass());
-    @Resource
-    private MarkerManager markerManager;
-
-
-    public Feature getFeatureById(Long id) {
-        Feature feature = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("id", id)).add(Restrictions.eq("isValid", 1));
-            feature = (Feature) criteria.list().get(0);
-        } catch (Exception e) {
-            return null;
-        }
-        return feature;
-    }
-
-    public FeatureDto getFeatureDtoById(Long id) {
-        return FeatureDto.convert2FeatureDto(getFeatureById(id));
-    }
-
-    /**
-     * 根据id，软删除某个点或线或片
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param ids 多个id
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public String invalidFeature(String ids) {
-        if (StringUtils.isBlank(ids) || ids.indexOf(")") != -1) {//未传入值，直接返回，防止无效查询,过滤非法请求，防止sql注入
-            return "";
-        }
-        String[] idsArr = ids.split(",");
-        StringBuilder canDeleteIds = new StringBuilder("");
-        StringBuilder cantDeleleIds = new StringBuilder("");
-        //找出能删除的和不能删除的id组合
-        for (String id : idsArr) {
-            Long longId = Long.valueOf(id);
-            if (this.isCanDelete(longId)) {
-                if (canDeleteIds.length() > 0) {
-                    canDeleteIds.append(",");
-                }
-                canDeleteIds.append(id);
-
-            } else {
-                if (cantDeleleIds.length() > 0) {
-                    cantDeleleIds.append(",");
-                }
-                cantDeleleIds.append(id);
-            }
-        }
-
-        String temp1Ids = canDeleteIds.toString();
-        String temp2Ids = cantDeleleIds.toString();
-        if (StringUtils.isNotBlank(temp2Ids)) {//有不能删除的，都不删除
-            return "";
-        }
-        Query query = this.getSession().createQuery("update Feature f set f.isValid = 0 where id in (" + temp1Ids + ")");
-        query.executeUpdate();
-
-        return "success";
-    }
-
-    /**
-     * 判断feature是否可以删除
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param id
-     * @return
-     */
-    private boolean isCanDelete(Long id) {
-        Feature feature = this.getFeatureById(id);
-        if (feature.getParent() == null) {//所有用户共用的根节点不能删除
-            return false;
-        }
-        if (CollectionUtils.isNotEmpty(feature.getChildren())) {
-            for (Feature child : feature.getChildren()) {
-                if (child.isValid() == 1) {
-                    return false;
-                }
-            }
-
-        }
-        List<Marker> markers = markerManager.getMarkerByFeature(feature);
-        if (CollectionUtils.isNotEmpty(markers)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * 将数据库中的feature信息按照参数更新
-     *
-     * @param feature
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public void saveOrupdateFeature(Feature feature, User user) {
-        this.getSession().saveOrUpdate(feature);
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param user 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByUser")
-    public List<FeatureDto> getFeaturesByUser(Integer type, User user) {
-        if (user == null) {
-            return Collections.emptyList();
-        }
-        Company company = user.getCompany();
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("type", type));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-        return FeatureDto.convert2FeatureDtos(features);
-    }
-
-    /**
-     * 分页使用，datatable获取相应type的feature某页数据
-     *
-     * @param params
-     * @param user
-     * @return
-     */
-    public DataTable<FeatureDto> getPageFeatureListByTye(String params, Feature parent, User user) {
-        DataTable<FeatureDto> result = new DataTable<FeatureDto>();
-        DataTableParameter parameter = DataTableUtils.getDataTableParameterByJsonParam(params);
-        int start = parameter.getiDisplayStart();
-        int pageSize = parameter.getiDisplayLength();
-        int pageNo = (start / pageSize) + 1;
-        Criteria criteria = this.createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        Company company = user.getCompany();
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("isValid", 1)).add(Restrictions.eq("parent", parent));
-        Page page = pagedQuery(criteria, pageNo, pageSize);
-        List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos((List<Feature>) page.getResult());
-        result.setAaData(featureDtos);
-        result.setiTotalDisplayRecords((int) page.getTotalCount());
-        result.setiTotalRecords((int) page.getTotalCount());
-        result.setsEcho(parameter.getsEcho());
-        return result;
-
-
-    }
-
-    /**
-     * 获取层次结构列表,增加缓存
-     *
-     * @param type
-     * @param company
-     * @return
-     */
-    @Cacheable(value = "getOrgList")
-    public String getOrgList(Integer type, Company company) {
-        List<OrgDto> orgDtos = new ArrayList<OrgDto>();
-        List<Feature> features = this.getRootFeatures(type);
-        for (Feature feature : features) {
-            orgDtos.add(this.getChildrenByParentId(feature.getId(), company));
-        }
-        String jsonStr = null;
-        try {
-            jsonStr = new JsonMapper().toJson(orgDtos);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return jsonStr;
-    }
-
-    //    @Cacheable(value = "getChildrenByParentId", key = "#id")
-    public OrgDto getChildrenByParentId(Long id, Company company) {
-        if (id == null) {
-            return null;
-        }
-        Feature feature = getFeatureById(id);
-        if (feature == null) {
-            return null;
-        }
-        //创建OrgDto节点
-        OrgDto orgDto = new OrgDto();
-        orgDto.setId(id); //保存ID信息
-        orgDto.setName(feature.getFeatureName());
-        if (feature.getParent() != null) {
-            orgDto.setParentId(feature.getParent().getId());
-        }
-        List<Feature> departments = this.getActiveChildrenOrgs(feature, company);
-        for (Feature fea : departments) {
-            orgDto.getChildren().add(this.getChildrenByParentId(fea.getId(), company));
-        }
-        return orgDto;
-    }
-
-    //    @Cacheable(value = "getActiveChildrenOrgs", key = "#department.getId()")
-    private List<Feature> getActiveChildrenOrgs(Feature department, Company company) {
-        List<Feature> features = new ArrayList<Feature>();
-        for (Feature feature : department.getChildren()) {
-            if (feature.isValid() == 1 && feature.getCompany().getId().equals(company.getId())) {
-                features.add(feature);
-            }
-        }
-        return features;
-    }
-
-
-    public List<Feature> getRootFeatures(Integer type) {
-        List<Feature> features = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("type", type)).add(Restrictions.isNull("parent"));
-            features = criteria.list();
-        } catch (Exception e) {
-            return Collections.emptyList();
-        }
-        return features;
-
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param company 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByCompany", key = "#company.getId()")
-    public List<Feature> getFeaturesByCompany(Company company) {
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-        criteria.add(Restrictions.eq("company", company));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-
-        for (Feature f : features) {
-            f.getChildren().toString();
-            f.getOwner().toString();
-            if (f.getParent() != null)
-                f.getParent().toString();
-        }
-        return features;
-    }
-
-    /**
-     * 根据组织结构的id获取叶子节点
-     ***重要：**已更改为包含本节点****
-     * @param type
-     * @param feature
-     * @return
-     */
-    public List<Feature> getLeafByParentId(Integer type, Feature feature) {
-        if (feature == null || feature.isValid() == 0) return Collections.emptyList();
-        List<Feature> features = new ArrayList<Feature>();
-        if (CollectionUtils.isEmpty(feature.getChildren())) {
-            features.add(feature);
-            return features;
-        }
-        List<Feature> children = feature.getChildren();
-        boolean flag = false;
-        for (Feature child : children) {
-            if (child.isValid() == 1) {
-                flag = true;
-                features.addAll(getLeafByParentId(type, child));
-            }
-        }
-//        if (!flag) {//没有有效的子节点
-            features.add(feature);
-//        }
-        return features;
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java b/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
deleted file mode 100644
index a706a36..0000000
--- a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package com.casic.accessControl.feature.web;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.Role;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.CompanyManager;
-import com.casic.accessControl.user.manager.UserManager;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.StringUtils;
-import com.casic.accessControl.xls.Common;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import sun.org.mozilla.javascript.internal.EcmaError;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.IOException;
-import java.util.*;
-
-/**
- * 提供http访问接口
- * Created by lenovo on 2016/5/16.
- */
-@Controller
-@RequestMapping(value = "feature")
-public class FeatureController {
-    @Autowired
-    private FeatureManager featureManager;
-    @Autowired
-    private UserManager userManager;
-    @Autowired
-    private CompanyManager companyManager;
-
-    @RequestMapping(value = "org-list")
-    @ResponseBody
-    public String getOrgList(@RequestParam(required = true) Integer type, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Company company = user.getCompany();
-        return featureManager.getOrgList(type, company);
-    }
-
-    @RequestMapping(value = "org-list-na")
-    @ResponseBody
-    public Map<String, String> getOrgListNa(@RequestParam Long userId) {//na端所有传过来的userid都是公司id
-        Map<String, String> res = new HashMap<String, String>();
-        res.put("message", "列表获取失败");
-        try {
-//            User user = userManager.getUserById(userId);//获取当前登录用户
-//            Company company = user.getCompany();
-            Company company = companyManager.getCompanyById(userId);
-            String areas = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.AREA.getIndex(), company);
-            String lines = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.LINE.getIndex(), company);
-            res.put("feature", areas);
-            res.put("line", lines);
-        } catch (Exception e) {
-            return res;
-        }
-        res.put("message", "成功获取");
-        return res;
-    }
-
-    @RequestMapping(value = "getFeature")
-    @ResponseBody
-    public Map<String, Object> getFeaturesByUser(@RequestParam(required = true) Integer type, HttpSession session) {
-
-        Map<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        List<FeatureDto> list = featureManager.getFeaturesByUser(type, user);
-        if (list == null) {//获取列表失败
-            result.put("message", "获取列表出现错误");
-            return result;
-        } else {
-            result.put("data", list);
-            result.put("message", "获取列表成功");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "getSubFeatureList")
-    public void getSubFeatureList(@RequestParam(required = true) String jsonParams, @RequestParam(required = false) Long parentId, HttpServletResponse response, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Feature parent = featureManager.getFeatureById(parentId);
-        DataTable<FeatureDto> dtoDataTable = featureManager.getPageFeatureListByTye(jsonParams, parent, user);
-        Gson gson = new Gson();
-        String json = gson.toJson(dtoDataTable);
-        response.setCharacterEncoding("utf-8");
-        try {
-            response.getWriter().write(json);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @RequestMapping(value = "delete")
-    @ResponseBody
-    public Map<String, Object> deleteFeatureById(@RequestParam(required = true) Long id, HttpSession session) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        try {
-            String res = featureManager.invalidFeature(id.toString());
-            if (StringUtils.isBlank(res)) {
-                result.put("message", "删除失败");
-            } else {
-                result.put("message", "删除成功");
-                result.put("success", true);
-            }
-        } catch (Exception e) {
-            result.put("message", "删除失败");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "save")
-    @ResponseBody
-    public Map<String, Object> save(@RequestParam(required = true) String params, HttpSession session) {
-        Gson gson = new Gson();
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        Map markers = gson.fromJson(params, HashMap.class);
-        String featureName = (String) markers.get("featureName");
-        String memo = (String) markers.get("memo") == null ? "" : (String) markers.get("memo");
-        Long parentId = Long.valueOf(StringUtils.isBlank((String) markers.get("parentId")) ? "-1" : (String) markers.get("parentId"));//不知为什么转过来为Double
-        Long id = Long.valueOf(StringUtils.isBlank((String) markers.get("id")) ? "-1" : (String) markers.get("id"));
-
-
-        if (StringUtils.isBlank(featureName) || parentId.equals(-1L)) {
-            result.put("message", "必要参数未传送");
-            return result;
-        }
-        Feature feature = new Feature();
-        feature.setValid(1);
-        Feature parent = featureManager.getFeatureById(parentId);
-        feature.setParent(parent);
-        feature.setFeatureName(featureName);
-        feature.setMemo(memo);
-        feature.setOwner(user);
-        feature.setCompany(user.getCompany());
-        feature.setType(parent.getType());
-        if (!id.equals(-1L)) {
-            feature.setId(id);
-        }
-        try {
-            featureManager.saveOrupdateFeature(feature, user);
-            result.put("message", "保存成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "保存失败");
-        }
-        return result;
-
-    }
-
-
-    @RequestMapping(value = "getFeatureById")
-    @ResponseBody
-    public Map<String, Object> getFeatureById(@RequestParam(required = true) Long id) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        try {
-            FeatureDto feature = featureManager.getFeatureDtoById(id);
-            result.put("data", feature);
-            result.put("message", "获取成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "获取失败");
-        }
-        return result;
-
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
index 08a290e..3f53635 100644
--- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
+++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
@@ -1,6 +1,6 @@
 package com.casic.accessControl.marker.dto;
 
-import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.domain.Feature;
 import com.casic.accessControl.marker.domain.Marker;
 import org.apache.commons.collections.CollectionUtils;
 
diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
index 080b291..7fe7434 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -4,8 +4,6 @@
 import com.casic.accessControl.core.hibernate.HibernateEntityDao;
 import com.casic.accessControl.core.page.Page;
 import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.user.domain.Company;
@@ -49,9 +47,6 @@
 public class MarkerManager extends HibernateEntityDao<Marker> {
 
     @Resource
-    private FeatureManager featureManager;
-
-    @Resource
     private UserManager userInfoManager;
 
 
@@ -154,33 +149,33 @@
 
     //获取marker
 //    @Cacheable(value = "getMarkerByFeature", key = "#feature.getId()")
-    public List<Marker> getMarkerByFeature(Feature feature) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            criteria.add(Restrictions.eq("belongLine", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            criteria.add(Restrictions.eq("belongLine", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
-    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
-            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
+//            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
     public boolean saveMarker(Marker marker) {
         try {
@@ -465,7 +460,7 @@
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setLayStyle(sheet.getCell(indexMap.get("layStyle"), i).getContents());
-                } else if(recordTypeFlag == 4) {
+                } else if (recordTypeFlag == 4) {
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setBelowType(sheet.getCell(indexMap.get("belowType"), i).getContents());
diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
index a19f2f5..7675e1f 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -2,9 +2,6 @@
 
 import com.casic.accessControl.core.ext.export.CsvExportor;
 import com.casic.accessControl.core.ext.export.TableModel;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.manager.MarkerManager;
diff --git a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java b/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
deleted file mode 100644
index e69de29..0000000
--- a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
+++ /dev/null
diff --git a/src/main/java/com/casic/accessControl/rs/FeatureResource.java b/src/main/java/com/casic/accessControl/rs/FeatureResource.java
index 68aeb97..e97f18b 100644
--- a/src/main/java/com/casic/accessControl/rs/FeatureResource.java
+++ b/src/main/java/com/casic/accessControl/rs/FeatureResource.java
@@ -1,65 +1,65 @@
-package com.casic.accessControl.rs;
-
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.UserManager;
-import com.google.gson.Gson;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import javax.annotation.Resource;
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
-* Created by admin on 2015/1/15.
-*/
-@Component
-@Path("feature")
-public class FeatureResource
-{
-    private static Logger logger = LoggerFactory.getLogger(FeatureResource.class);
-
-    @Resource
-    private UserManager userManager;
-
-    @Resource
-    private FeatureManager featureManager;
-
-    @GET
-    @Path("get")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map get(@QueryParam("userName") String userName ){
-        Map map = new HashMap<String, Object>();
-        try {
-            User user = userManager.getUserByName(userName);
-            if (user == null) {
-                map.put("success", "false");
-                map.put("message", "人员不存在！");
-                return map;
-            }
-            Company company = user.getCompany();
-            if (company!=null)
-            {
-                List<Feature> features = featureManager.getFeaturesByCompany(company);
-                List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos(features);
-                map.put("success", "true");
-                map.put("message", featureDtos);
-            }
-        }
-        catch (Exception e)
-        {
-            map.put("success", "false");
-            map.put("message", e.getMessage());
-        }
-        return  map;
-    }
-}
+//package com.casic.accessControl.rs;
+//
+//import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.dto.FeatureDto;
+//import com.casic.accessControl.feature.manager.FeatureManager;
+//import com.casic.accessControl.user.domain.Company;
+//import com.casic.accessControl.user.domain.User;
+//import com.casic.accessControl.user.manager.UserManager;
+//import com.google.gson.Gson;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.stereotype.Component;
+//import org.springframework.web.bind.annotation.RequestParam;
+//
+//import javax.annotation.Resource;
+//import javax.ws.rs.*;
+//import javax.ws.rs.core.MediaType;
+//import java.util.HashMap;
+//import java.util.List;
+//import java.util.Map;
+//
+///**
+//* Created by admin on 2015/1/15.
+//*/
+//@Component
+//@Path("feature")
+//public class FeatureResource
+//{
+//    private static Logger logger = LoggerFactory.getLogger(FeatureResource.class);
+//
+//    @Resource
+//    private UserManager userManager;
+//
+//    @Resource
+//    private FeatureManager featureManager;
+//
+//    @GET
+//    @Path("get")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public Map get(@QueryParam("userName") String userName ){
+//        Map map = new HashMap<String, Object>();
+//        try {
+//            User user = userManager.getUserByName(userName);
+//            if (user == null) {
+//                map.put("success", "false");
+//                map.put("message", "人员不存在！");
+//                return map;
+//            }
+//            Company company = user.getCompany();
+//            if (company!=null)
+//            {
+//                List<Feature> features = featureManager.getFeaturesByCompany(company);
+//                List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos(features);
+//                map.put("success", "true");
+//                map.put("message", featureDtos);
+//            }
+//        }
+//        catch (Exception e)
+//        {
+//            map.put("success", "false");
+//            map.put("message", e.getMessage());
+//        }
+//        return  map;
+//    }
+//}
diff --git a/src/main/java/com/casic/accessControl/rs/MapInfo.java b/src/main/java/com/casic/accessControl/rs/MapInfo.java
deleted file mode 100644
index a77fce9..0000000
--- a/src/main/java/com/casic/accessControl/rs/MapInfo.java
+++ /dev/null
@@ -1,131 +0,0 @@
-//package com.casic.accessControl.rs;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-///**
-// * Created by admin on 2015/8/26.
-// */
-//public class MapInfo {
-//
-//    private String mapUrl;
-//
-//    private String updateTime;
-//
-//    private String uploader;
-//
-//    private String name;
-//
-//    private String uuid;
-//
-//    private String site;
-//    /*
-//    0:草稿
-//    1：待审核
-//    2：通过
-//    3: 驳回
-//     */
-//    private String status;
-//
-//    //
-//    private int id;
-//
-//
-//    public String getMapUrl()
-//    {
-//        return mapUrl;
-//    }
-//
-//    public void setMapUrl(String mapUrl)
-//    {
-//        this.mapUrl = mapUrl;
-//    }
-//
-//    public String getUpdateTime()
-//    {
-//        return updateTime;
-//    }
-//
-//    public void setUpdateTime(String updateTime)
-//    {
-//        this.updateTime = updateTime;
-//    }
-//
-//    public String getUploader()
-//    {
-//        return uploader;
-//    }
-//
-//    public void setUploader(String uploader)
-//    {
-//        this.uploader = uploader;
-//    }
-//
-//    public String getName()
-//    {
-//        return name;
-//    }
-//
-//    public void setName(String name)
-//    {
-//        this.name = name;
-//    }
-//
-//    public String getUuid()
-//    {
-//        return uuid;
-//    }
-//
-//    public void setUuid(String uuid)
-//    {
-//        this.uuid = uuid;
-//    }
-//
-//    public String getSite()
-//    {
-//        return site;
-//    }
-//
-//    public void setSite(String site)
-//    {
-//        this.site = site;
-//    }
-//
-//    public String getStatus()
-//    {
-//        return status;
-//    }
-//
-//    public void setStatus(String status)
-//    {
-//        this.status = status;
-//    }
-//
-//    public int getId()
-//    {
-//        return id;
-//    }
-//
-//    public void setId(int id)
-//    {
-//        this.id = id;
-//    }
-//
-//    public static List<MapInfo> getMockerMaps()
-//    {
-//        List<MapInfo> maps = new ArrayList<MapInfo>();
-//        for (int i = 0; i < 20; i++)
-//        {
-//            MapInfo map = new MapInfo();
-//            map.setId(i);
-//            map.setUploader("张帆");
-//            map.setMapUrl("http://192.168.0.111:9080/accessControl/logo.jpg");
-//            map.setSite("永旺路"+i);
-//            map.setUpdateTime("2015-08-02");
-//            map.setStatus("待审核");
-//            maps.add(map);
-//        }
-//        return maps;
-//
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/rs/MarkResource.java b/src/main/java/com/casic/accessControl/rs/MarkResource.java
index 8ae4d85..cef1580 100644
--- a/src/main/java/com/casic/accessControl/rs/MarkResource.java
+++ b/src/main/java/com/casic/accessControl/rs/MarkResource.java
@@ -1,7 +1,7 @@
 package com.casic.accessControl.rs;
 
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
+//import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.manager.MarkerManager;
 import com.casic.accessControl.user.domain.Company;
@@ -35,8 +35,8 @@
     @Resource
     private MarkerManager markerManager;
 
-    @Resource
-    private FeatureManager featureManager;
+//    @Resource
+//    private FeatureManager featureManager;
 
     @GET
     @Path("post")
diff --git a/src/main/java/com/casic/accessControl/rs/UserObj.java b/src/main/java/com/casic/accessControl/rs/UserObj.java
deleted file mode 100644
index c0fe651..0000000
--- a/src/main/java/com/casic/accessControl/rs/UserObj.java
+++ /dev/null
@@ -1,61 +0,0 @@
-//package com.casic.accessControl.rs;
-//
-//import java.io.Serializable;
-//
-///**
-// * Created by admin on 2015/10/9.
-// */
-//public class UserObj implements Serializable {
-//    private String userName;
-//    private String password;
-//    private String appId;
-//    /*
-//    roles:��ɫ֮���Զ��ŷָ�
-//     */
-//    private String roles;
-//
-//    /*
-//    authorities:Ȩ��֮���Զ��ŷָ�
-//    */
-//    private String authorities;
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public String getPassword() {
-//        return password;
-//    }
-//
-//    public void setPassword(String password) {
-//        this.password = password;
-//    }
-//
-//    public String getAppId() {
-//        return appId;
-//    }
-//
-//    public void setAppId(String appId) {
-//        this.appId = appId;
-//    }
-//
-//    public String getRoles() {
-//        return roles;
-//    }
-//
-//    public void setRoles(String roles) {
-//        this.roles = roles;
-//    }
-//
-//    public String getAuthorities() {
-//        return authorities;
-//    }
-//
-//    public void setAuthorities(String authorities) {
-//        this.authorities = authorities;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java b/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java
deleted file mode 100644
index ac60ed5..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java
+++ /dev/null
@@ -1,65 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//import org.geotools.referencing.operation.transform.NADCONTransform;
-//
-//import javax.persistence.*;
-//
-///**
-// * Created by test203 on 2015/10/29.
-// */
-//@Entity
-//@Table(name = "ZX_DATABASE_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_DATABASE_INFO_ID", sequenceName = "SEQ_ZX_DATABASE_INFO_ID", allocationSize = 1, initialValue = 1)
-//public class DataBaseInfo {
-//    private Long id;
-//    private String account;
-//    private String password;
-//    private String sid;
-//    private String owner;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_ZX_DATABASE_INFO_ID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "ACCOUNT", nullable = false)
-//    public String getAccount() {
-//        return account;
-//    }
-//
-//    public void setAccount(String account) {
-//        this.account = account;
-//    }
-//
-//    @Column(name = "PASSWORD", nullable = false)
-//    public String getPassword() {
-//        return password;
-//    }
-//
-//    public void setPassword(String password) {
-//        this.password = password;
-//    }
-//
-//    @Column(name = "SID", nullable = false)
-//    public String getSid() {
-//        return sid;
-//    }
-//
-//    public void setSid(String sid) {
-//        this.sid = sid;
-//    }
-//
-//    @Column(name = "OWNER", nullable = false)
-//    public String getOwner() {
-//        return owner;
-//    }
-//
-//    public void setOwner(String owner) {
-//        this.owner = owner;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java b/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java
deleted file mode 100644
index 9578060..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java
+++ /dev/null
@@ -1,77 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//import com.casic.accessControl.org.domain.UserInfo;
-//
-//import javax.persistence.*;
-//import java.util.Date;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Entity
-//@Table(name = "ZX_ORCL_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_ORCL_INFO_ID",sequenceName = "SEQ_ZX_ORCL_INFO_ID",allocationSize = 1,initialValue = 1)
-//public class OrclInfo {
-//    private Long id;
-//    private String fileName;
-//    private String filePath;
-//    private String memo;
-//    private Date bkDay = new Date();
-//    private UserInfo userInfo;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE,generator = "SEQ_ZX_ORCL_INFO_ID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "FILE_NAME",nullable = false)
-//    public String getFileName() {
-//        return fileName;
-//    }
-//
-//    public void setFileName(String fileName) {
-//        this.fileName = fileName;
-//    }
-//
-//    @Column(name = "FILE_PATH",nullable = false)
-//    public String getFilePath() {
-//        return filePath;
-//    }
-//
-//    public void setFilePath(String filePath) {
-//        this.filePath = filePath;
-//    }
-//
-//    @Column(name = "MEMO")
-//    public String getMemo() {
-//        return memo;
-//    }
-//
-//    public void setMemo(String memo) {
-//        this.memo = memo;
-//    }
-//
-//    @Column(name = "BK_DAY")
-//    public Date getBkDay() {
-//        return bkDay;
-//    }
-//
-//    public void setBkDay(Date bkDay) {
-//        this.bkDay = bkDay;
-//    }
-//
-//    @ManyToOne(fetch = FetchType.LAZY)
-//    @JoinColumn(name = "USER_ID")
-//    public UserInfo getUserInfo() {
-//        return userInfo;
-//    }
-//
-//    public void setUserInfo(UserInfo userInfo) {
-//        this.userInfo = userInfo;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/SysLogInfo.java b/src/main/java/com/casic/accessControl/sys/domain/SysLogInfo.java
deleted file mode 100644
index 60e5583..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/SysLogInfo.java
+++ /dev/null
@@ -1,70 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//
-//import com.casic.accessControl.user.domain.UserInfo;
-//
-//import javax.persistence.*;
-//import java.io.Serializable;
-//import java.util.Date;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Entity
-//@Table(name = "ZX_SYS_LOG_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_SYS_LOG_ID",sequenceName = "SEQ_ZX_SYS_LOG_ID",allocationSize = 1,initialValue = 1)
-//public class SysLogInfo implements Serializable{
-//    private Long id;
-//    private String logType;//系统日志、运行日志、操作日志
-//    private String msg;
-//    private Date logDay = new Date();
-//    private UserInfo user;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE,generator = "SEQ_ZX_SYS_LOG_ID")
-//    @Column(name = "DBID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "LOG_TYPE",nullable = false)
-//    public String getLogType() {
-//        return logType;
-//    }
-//
-//    public void setLogType(String logType) {
-//        this.logType = logType;
-//    }
-//
-//    @Column(name = "LOG_MSG",nullable = false)
-//    public String getMsg() {
-//        return msg;
-//    }
-//
-//    public void setMsg(String msg) {
-//        this.msg = msg;
-//    }
-//
-//    @Column(name = "LOG_DAY")
-//    public Date getLogDay() {
-//        return logDay;
-//    }
-//
-//    public void setLogDay(Date logDay) {
-//        this.logDay = logDay;
-//    }
-//
-//    @ManyToOne(fetch = FetchType.LAZY)
-//    @JoinColumn(name = "USER_ID")
-//    public UserInfo getUser() {
-//        return user;
-//    }
-//
-//    public void setUser(UserInfo user) {
-//        this.user = user;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/dto/ExcelInfoDTO.java b/src/main/java/com/casic/accessControl/sys/dto/ExcelInfoDTO.java
deleted file mode 100644
index 2fe496e..0000000
--- a/src/main/java/com/casic/accessControl/sys/dto/ExcelInfoDTO.java
+++ /dev/null
@@ -1,77 +0,0 @@
-//package com.casic.accessControl.sys.dto;
-//
-//import com.casic.accessControl.sys.domain.SysLogInfo;
-//import com.casic.accessControl.util.DateUtils;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-///**
-// * Created by test203 on 2015/10/23.
-// */
-//public class ExcelInfoDTO {
-//    private String logType;//系统日志、运行日志、操作日志
-//    private String msg;
-//    private String logDay;
-//    private String userName;
-//
-//    public String getLogType() {
-//        return logType;
-//    }
-//
-//    public void setLogType(String logType) {
-//        this.logType = logType;
-//    }
-//
-//    public String getMsg() {
-//        return msg;
-//    }
-//
-//    public void setMsg(String msg) {
-//        this.msg = msg;
-//    }
-//
-//    public String getLogDay() {
-//        return logDay;
-//    }
-//
-//    public void setLogDay(String logDay) {
-//        this.logDay = logDay;
-//    }
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public static ExcelInfoDTO ConvertToDTO(SysLogInfo logInfo){
-//        if(null!=logInfo){
-//            ExcelInfoDTO dto = new ExcelInfoDTO();
-//            dto.setLogType(logInfo.getLogType());
-//            if(null!=logInfo.getLogDay()){
-//                dto.setLogDay(DateUtils.sdf2.format(logInfo.getLogDay()));
-//            }else {
-//                dto.setLogDay(" ");
-//            }
-//            dto.setMsg(logInfo.getMsg());
-//            if(null!=logInfo.getUser()){
-//                dto.setUserName(logInfo.getUser().getUserName());
-//            }else {
-//                dto.setUserName(" ");
-//            }
-//            return dto;
-//        }
-//        return new ExcelInfoDTO();
-//    }
-//
-//    public static List<ExcelInfoDTO> ConvertToDTO(List<SysLogInfo> list){
-//        List<ExcelInfoDTO> dtoList = new ArrayList<ExcelInfoDTO>();
-//        for(SysLogInfo log : list){
-//            dtoList.add(ConvertToDTO(log));
-//        }
-//        return dtoList;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/dto/OrclInfoDTO.java b/src/main/java/com/casic/accessControl/sys/dto/OrclInfoDTO.java
deleted file mode 100644
index 46a261d..0000000
--- a/src/main/java/com/casic/accessControl/sys/dto/OrclInfoDTO.java
+++ /dev/null
@@ -1,124 +0,0 @@
-//package com.casic.accessControl.sys.dto;
-//
-//import com.casic.accessControl.org.domain.UserInfo;
-//import com.casic.accessControl.shp.domain.LayerInfo;
-//import com.casic.accessControl.sys.domain.OrclInfo;
-//import com.casic.accessControl.util.DateUtils;
-//
-//import java.util.ArrayList;
-//import java.util.Date;
-//import java.util.List;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//public class OrclInfoDTO {
-//    private Long id;
-//    private String fileName;
-//    private String filePath;
-//    private String memo;
-//    private String bkDay;
-//    private Long userId;
-//    private String userName;
-//    private String btnRestor = "<a href='#' class='btn mini blue'>还原</a>";
-//    private String btnDelete = "<a href='#' class='btn mini red'>删除</a>";
-//
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    public String getFileName() {
-//        return fileName;
-//    }
-//
-//    public void setFileName(String fileName) {
-//        this.fileName = fileName;
-//    }
-//
-//    public String getFilePath() {
-//        return filePath;
-//    }
-//
-//    public void setFilePath(String filePath) {
-//        this.filePath = filePath;
-//    }
-//
-//    public String getMemo() {
-//        return memo;
-//    }
-//
-//    public void setMemo(String memo) {
-//        this.memo = memo;
-//    }
-//
-//    public String getBkDay() {
-//        return bkDay;
-//    }
-//
-//    public void setBkDay(String bkDay) {
-//        this.bkDay = bkDay;
-//    }
-//
-//    public Long getUserId() {
-//        return userId;
-//    }
-//
-//    public void setUserId(Long userId) {
-//        this.userId = userId;
-//    }
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public String getBtnRestor() {
-//        return btnRestor;
-//    }
-//
-//    public void setBtnRestor(String btnRestor) {
-//        this.btnRestor = btnRestor;
-//    }
-//
-//    public String getBtnDelete() {
-//        return btnDelete;
-//    }
-//
-//    public void setBtnDelete(String btnDelete) {
-//        this.btnDelete = btnDelete;
-//    }
-//
-//    public static OrclInfoDTO ConvertToDTO(OrclInfo orcl){
-//        if(null!=orcl){
-//            OrclInfoDTO dto = new OrclInfoDTO();
-//            dto.setId(orcl.getId());
-//            dto.setFileName(orcl.getFileName());
-//            dto.setFilePath(orcl.getFilePath());
-//            dto.setMemo(orcl.getMemo());
-//            if(null!=orcl.getBkDay()){
-//                dto.setBkDay(DateUtils.sdf1.format(orcl.getBkDay()));
-//            }
-//            if(null!=orcl.getUserInfo()){
-//                dto.setUserId(orcl.getUserInfo().getId());
-//                dto.setUserName(orcl.getUserInfo().getUsername());
-//            }
-//            return dto;
-//        }
-//        return new OrclInfoDTO();
-//    }
-//
-//    public static List<OrclInfoDTO> ConvertToDTO(List<OrclInfo> list){
-//        List<OrclInfoDTO> dtoList = new ArrayList<OrclInfoDTO>();
-//        for(OrclInfo orcl : list){
-//            dtoList.add(ConvertToDTO(orcl));
-//        }
-//        return dtoList;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/dto/SysLogInfoDTO.java b/src/main/java/com/casic/accessControl/sys/dto/SysLogInfoDTO.java
deleted file mode 100644
index 64d6c39..0000000
--- a/src/main/java/com/casic/accessControl/sys/dto/SysLogInfoDTO.java
+++ /dev/null
@@ -1,103 +0,0 @@
-//package com.casic.accessControl.sys.dto;
-//
-//import com.casic.accessControl.sys.domain.SysLogInfo;
-//import com.casic.accessControl.util.DateUtils;
-//
-//import java.util.ArrayList;
-//import java.util.Date;
-//import java.util.List;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//public class SysLogInfoDTO {
-//    private Long id;
-//    private String logType;//系统日志、运行日志、操作日志
-//    private String msg;
-//    private String logDay;
-//    private Long userId;
-//    private String userName;
-//    private String btn = "<a href='#' class='btn mini blue'>查看</a>";
-//
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    public String getLogType() {
-//        return logType;
-//    }
-//
-//    public void setLogType(String logType) {
-//        this.logType = logType;
-//    }
-//
-//    public String getMsg() {
-//        return msg;
-//    }
-//
-//    public void setMsg(String msg) {
-//        this.msg = msg;
-//    }
-//
-//    public String getLogDay() {
-//        return logDay;
-//    }
-//
-//    public void setLogDay(String logDay) {
-//        this.logDay = logDay;
-//    }
-//
-//    public Long getUserId() {
-//        return userId;
-//    }
-//
-//    public void setUserId(Long userId) {
-//        this.userId = userId;
-//    }
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public String getBtn() {
-//        return btn;
-//    }
-//
-//    public void setBtn(String btn) {
-//        this.btn = btn;
-//    }
-//
-//    public static SysLogInfoDTO ConvertToDTO(SysLogInfo log){
-//        if(null!=log){
-//            SysLogInfoDTO dto = new SysLogInfoDTO();
-//            dto.setId(log.getId());
-//            dto.setLogType(log.getLogType());
-//            if(null!=log.getLogDay()){
-//                dto.setLogDay(DateUtils.sdf2.format(log.getLogDay()));
-//            }
-//            dto.setMsg(log.getMsg());
-//            if(null!=log.getUser()){
-//                dto.setUserId(log.getUser().getId());
-//                dto.setUserName(log.getUser().getUserName());
-//            }
-//            return dto;
-//        }
-//        return new SysLogInfoDTO();
-//    }
-//
-//    public static List<SysLogInfoDTO> ConvertToDTO(List<SysLogInfo> list){
-//        List<SysLogInfoDTO> dtoList = new ArrayList<SysLogInfoDTO>();
-//        for(SysLogInfo log : list){
-//            dtoList.add(ConvertToDTO(log));
-//        }
-//        return dtoList;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/manager/DataBaseInfoManager.java b/src/main/java/com/casic/accessControl/sys/manager/DataBaseInfoManager.java
deleted file mode 100644
index b1395e6..0000000
--- a/src/main/java/com/casic/accessControl/sys/manager/DataBaseInfoManager.java
+++ /dev/null
@@ -1,19 +0,0 @@
-//package com.casic.accessControl.sys.manager;
-//
-//import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-//import com.casic.accessControl.sys.domain.DataBaseInfo;
-//import org.hibernate.Criteria;
-//import org.springframework.stereotype.Service;
-//
-///**
-// * Created by test203 on 2015/10/29.
-// */
-//@Service
-//public class DataBaseInfoManager extends HibernateEntityDao<DataBaseInfo>{
-//    public Criteria getCriteria(){
-//        return  getSession().createCriteria(DataBaseInfo.class);
-//    }
-//    public Object getDataBaseInfo(){
-//        return getCriteria().uniqueResult();
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/manager/OrclInfoManager.java b/src/main/java/com/casic/accessControl/sys/manager/OrclInfoManager.java
deleted file mode 100644
index d9804a1..0000000
--- a/src/main/java/com/casic/accessControl/sys/manager/OrclInfoManager.java
+++ /dev/null
@@ -1,127 +0,0 @@
-//package com.casic.accessControl.sys.manager;
-//
-//import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-//import com.casic.accessControl.core.page.Page;
-//import com.casic.accessControl.sys.domain.DataBaseInfo;
-//import com.casic.accessControl.sys.domain.OrclInfo;
-//import com.casic.accessControl.sys.dto.OrclInfoDTO;
-//import com.casic.accessControl.util.*;
-//import org.hibernate.Criteria;
-//import org.hibernate.criterion.Order;
-//import org.hibernate.criterion.Restrictions;
-//import org.springframework.jdbc.core.JdbcTemplate;
-//import org.springframework.stereotype.Service;
-//
-//import javax.annotation.Resource;
-//import java.io.File;
-//import java.io.IOException;
-//import java.text.ParseException;
-//import java.util.*;
-//
-///**
-//* Created by Administrator on 2015/8/17.
-//*/
-//@Service
-//public class OrclInfoManager extends HibernateEntityDao<OrclInfo> {
-//    @Resource
-//    private DataBaseInfoManager dataBaseInfoManager;
-//
-//    public void setDataBaseInfoManager(DataBaseInfoManager dataBaseInfoManager) {
-//        this.dataBaseInfoManager = dataBaseInfoManager;
-//    }
-//
-//    public Criteria getCriteria() {
-//        return getSession().createCriteria(OrclInfo.class);
-//    }
-//
-//    public DataTable<OrclInfoDTO> pageQueryOrclInfoDTO(String jsonParam, String beginDay, String endDay) throws ParseException {
-//        DataTableParameter dataTableParam = DataTableUtils.getDataTableParameterByJsonParam(jsonParam);
-//
-//        int start = dataTableParam.getiDisplayStart();
-//        int pageSize = dataTableParam.getiDisplayLength();
-//        int pageNo = (start / pageSize) + 1;
-//
-//        Criteria criteria = getCriteria();
-//        criteria.addOrder(Order.desc("id"));
-//
-//        if (StringUtils.isNotBlank(beginDay)) {
-//            criteria.add(Restrictions.ge("bkDay", DateUtils.sdf1.parse(beginDay)));
-//        }
-//        if (StringUtils.isNotBlank(endDay)) {
-//            Date date = DateUtils.sdf1.parse(endDay);
-//            Calendar calendar = Calendar.getInstance();
-//            calendar.setTime(date);
-//            calendar.add(Calendar.DATE, 1);
-//            criteria.add(Restrictions.le("bkDay", calendar.getTime()));
-//        }
-//
-//        Page page = pagedQuery(criteria, pageNo, pageSize);
-//
-//        List<OrclInfoDTO> dtoList = OrclInfoDTO.ConvertToDTO((List<OrclInfo>) page.getResult());
-//        DataTable<OrclInfoDTO> dt = new DataTable<OrclInfoDTO>();
-//        dt.setAaData(dtoList);
-//        dt.setiTotalDisplayRecords((int) page.getTotalCount());
-//        dt.setsEcho(dataTableParam.getsEcho());
-//        dt.setiTotalRecords((int) page.getTotalCount());
-//        return dt;
-//    }
-//
-//    public Map<String, Object> backupDB(String memo, String path) throws IOException, InterruptedException {
-//        Map<String, Object> map = new HashMap<String, Object>();
-//        DataBaseInfo db = (DataBaseInfo) dataBaseInfoManager.getDataBaseInfo();
-//        if (null == db) {
-//            map.put("success", false);
-//            map.put("message", "没有找到数据库配置！");
-//            return map;
-//        }
-//        String fileName = db.getSid() + DateUtils.sdfFile.format(new Date()) + ".dmp";
-//        String filePath = path + "\\" + fileName;
-//
-//        DataBaseUtils.doExp(db.getAccount(), db.getPassword(), db.getSid(), db.getOwner(), filePath);
-//
-//        OrclInfo orcl = new OrclInfo();
-//        orcl.setMemo(memo);
-//        orcl.setFileName(fileName);
-//        orcl.setFilePath(filePath);
-//        save(orcl);
-//
-//        map.put("success", true);
-//        return map;
-//    }
-//
-//    private String dropTables() {
-//        StringBuilder tables = new StringBuilder();
-//        JdbcTemplate jdbcTemplate = getJdbcTemplate();
-//        String sqlString = "SELECT TABLE_NAME FROM USER_TABLES WHERE TABLESPACE_NAME='USERS'";
-//        List<String> list = jdbcTemplate.queryForList(sqlString, java.lang.String.class);
-//        if (list.size() > 0) {
-//            for (String t : list) {
-//                tables.append(t).append(",");
-//                String sql = "DROP TABLE " + t + " CASCADE CONSTRAINTS";
-//                jdbcTemplate.execute(sql);
-//                System.out.println(sql);
-//            }
-//            return tables.deleteCharAt(tables.length() - 1).toString();
-//        }
-//        return "";
-//    }
-//
-//    public void doImp(Long id) throws IOException, InterruptedException {
-//        OrclInfoDTO dto = getDTO(id);
-//        if (StringUtils.isNotBlank(dto.getFilePath())) {
-//            String tbl = dropTables();
-//            DataBaseUtils.doImp("scott", "xxfw", "XXFW", dto.getFilePath(), tbl);
-//        }
-//    }
-//
-//    public OrclInfoDTO getDTO(Long id) {
-//        return OrclInfoDTO.ConvertToDTO(get(id));
-//    }
-//
-//    public void deleteDTO(Long id) {
-//        OrclInfo orcl = get(id);
-//        File file = new File(orcl.getFilePath());
-//        file.delete();
-//        remove(orcl);
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/manager/SysLogInfoManager.java b/src/main/java/com/casic/accessControl/sys/manager/SysLogInfoManager.java
deleted file mode 100644
index a2c83a4..0000000
--- a/src/main/java/com/casic/accessControl/sys/manager/SysLogInfoManager.java
+++ /dev/null
@@ -1,92 +0,0 @@
-//package com.casic.accessControl.sys.manager;
-//
-//
-//import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-//import com.casic.accessControl.core.page.Page;
-//import com.casic.accessControl.sys.domain.SysLogInfo;
-//import com.casic.accessControl.sys.dto.ExcelInfoDTO;
-//import com.casic.accessControl.sys.dto.SysLogInfoDTO;
-//import com.casic.accessControl.util.*;
-//import com.casic.accessControl.xls.ExportExcel;
-//import org.hibernate.Criteria;
-//import org.hibernate.criterion.Order;
-//import org.hibernate.criterion.Restrictions;
-//import org.springframework.stereotype.Service;
-//
-//import java.io.FileOutputStream;
-//import java.io.IOException;
-//import java.io.OutputStream;
-//import java.text.ParseException;
-//import java.util.*;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Service
-//public class SysLogInfoManager extends HibernateEntityDao<SysLogInfo> {
-//
-//    public Criteria getCriteria() {
-//        return getSession().createCriteria(SysLogInfo.class);
-//    }
-//
-//    public DataTable<SysLogInfoDTO> pageQueryLogInfoDTO(String jsonParam, String logType, String beginDay, String endDay) throws ParseException {
-//        DataTableParameter dataTableParam = DataTableUtils.getDataTableParameterByJsonParam(jsonParam);
-//
-//        int start = dataTableParam.getiDisplayStart();
-//        int pageSize = dataTableParam.getiDisplayLength();
-//        int pageNo = (start / pageSize) + 1;
-//
-//        Criteria criteria = getCriteria();
-//        criteria.addOrder(Order.desc("id"));
-//
-//        if (StringUtils.isNotBlank(logType)) {
-//            criteria.add(Restrictions.like("logType", "%" + logType + "%"));
-//        }
-//        if (StringUtils.isNotBlank(beginDay)) {
-//            criteria.add(Restrictions.ge("logDay", DateUtils.sdf1.parse(beginDay)));
-//        }
-//        if (StringUtils.isNotBlank(endDay)) {
-//            Date date = DateUtils.sdf1.parse(endDay);
-//            Calendar calendar = Calendar.getInstance();
-//            calendar.setTime(date);
-//            calendar.add(Calendar.DATE, 1);
-//            criteria.add(Restrictions.le("logDay", calendar.getTime()));
-//        }
-//
-//        Page page = pagedQuery(criteria, pageNo, pageSize);
-//
-//        List<SysLogInfoDTO> dtoList = SysLogInfoDTO.ConvertToDTO((List<SysLogInfo>) page.getResult());
-//        DataTable<SysLogInfoDTO> dt = new DataTable<SysLogInfoDTO>();
-//        dt.setAaData(dtoList);
-//        dt.setiTotalDisplayRecords((int) page.getTotalCount());
-//        dt.setsEcho(dataTableParam.getsEcho());
-//        dt.setiTotalRecords((int) page.getTotalCount());
-//        return dt;
-//    }
-//
-//    public SysLogInfoDTO getDTO(Long id) {
-//        return SysLogInfoDTO.ConvertToDTO(get(id));
-//    }
-//
-//    public Map<String, Object> expSysLogToExcel(String logType, String beginDay, String endDay, String path) throws ParseException, IOException {
-//        Map<String, Object> map = new HashMap<String, Object>();
-//        Criteria criteria = getCriteria();
-//        criteria.add(Restrictions.like("logType", "%" + logType + "%"));
-//        if (StringUtils.isNotBlank(beginDay)) {
-//            criteria.add(Restrictions.ge("logDay", DateUtils.sdf1.parse(beginDay)));
-//        }
-//        if (StringUtils.isNotBlank(endDay)) {
-//            Calendar calendar = Calendar.getInstance();
-//            calendar.setTime(DateUtils.sdf1.parse(endDay));
-//            calendar.add(Calendar.DATE, 1);
-//            criteria.add(Restrictions.le("logDay", calendar.getTime()));
-//        }
-//        List<ExcelInfoDTO> dtoList = ExcelInfoDTO.ConvertToDTO(criteria.list());
-//        String[] headers = {"日志类型", "日志内容", "日期", "操作人"};
-//        OutputStream out = new FileOutputStream(path);
-//        ExportExcel<ExcelInfoDTO> ex = new ExportExcel<ExcelInfoDTO>();
-//        ex.exportExcel(headers, dtoList, out);
-//        map.put("success", true);
-//        return map;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/web/OrclInfoController.java b/src/main/java/com/casic/accessControl/sys/web/OrclInfoController.java
deleted file mode 100644
index 22fa833..0000000
--- a/src/main/java/com/casic/accessControl/sys/web/OrclInfoController.java
+++ /dev/null
@@ -1,96 +0,0 @@
-//package com.casic.accessControl.sys.web;
-//
-//import com.casic.accessControl.core.mapper.JsonMapper;
-//import com.casic.accessControl.sys.dto.OrclInfoDTO;
-//import com.casic.accessControl.sys.dto.SysLogInfoDTO;
-//import com.casic.accessControl.sys.manager.OrclInfoManager;
-//import com.casic.accessControl.util.DataBaseUtils;
-//import com.casic.accessControl.util.DataTable;
-//import com.casic.accessControl.util.DateUtils;
-//import com.casic.accessControl.util.StringUtils;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//
-//import javax.annotation.Resource;
-//import javax.persistence.ManyToOne;
-//import javax.servlet.http.HttpServletRequest;
-//import javax.servlet.http.HttpServletResponse;
-//import javax.servlet.http.HttpSession;
-//import java.util.Date;
-//import java.util.HashMap;
-//import java.util.Map;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Controller
-//@RequestMapping("sys")
-//public class OrclInfoController {
-//
-//    @Resource
-//    private OrclInfoManager orclInfoManager;
-//
-//    public void setOrclInfoManager(OrclInfoManager orclInfoManager) {
-//        this.orclInfoManager = orclInfoManager;
-//    }
-//
-//    @RequestMapping("orcl-info-list")
-//    public void listOrcl(String jsonParam,
-//                         @RequestParam(value = "beginDay", required = false) String beginDay,
-//                         @RequestParam(value = "endDay", required = false) String endDay,
-//                         HttpServletResponse response) {
-//        try {
-//            DataTable<OrclInfoDTO> dt = orclInfoManager.pageQueryOrclInfoDTO(jsonParam, beginDay, endDay);
-//            String json = new JsonMapper().toJson(dt);
-//            response.setCharacterEncoding("utf-8");
-//            response.getWriter().write(json);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//    }
-//
-//    @RequestMapping("orcl-info-save")
-//    @ResponseBody
-//    public Map<String, Object> saveOrcl(String memo, HttpServletRequest request) {
-//        Map<String, Object> map = new HashMap<String, Object>();
-//        try {
-//            String path = request.getSession().getServletContext().getRealPath("content\\dmp");
-//            map = orclInfoManager.backupDB(memo, path);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            map.put("success", false);
-//            map.put("message", "数据备份失败！");
-//        }
-//        return map;
-//    }
-//
-//    @RequestMapping("orcl-info-restore")
-//    @ResponseBody
-//    public Map<String, Object> restoreData(@RequestParam(value = "id", required = true) Long id) {
-//        Map<String, Object> map = new HashMap<String, Object>();
-//        try {
-//            orclInfoManager.doImp(id);
-//            map.put("success", true);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            map.put("success", false);
-//        }
-//        return map;
-//    }
-//
-//    @RequestMapping("orcl-info-delete")
-//    @ResponseBody
-//    public Map<String, Object> deleteOrclInfo(@RequestParam(value = "id", required = true) Long id) {
-//        Map<String, Object> map = new HashMap<String, Object>();
-//        try {
-//            orclInfoManager.deleteDTO(id);
-//            map.put("success", true);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            map.put("success", false);
-//        }
-//        return map;
-//    }
-//}

diff --git a/src/main/java/com/casic/accessControl/feature/domain/Feature.java b/src/main/java/com/casic/accessControl/feature/domain/Feature.java
deleted file mode 100644
index c89a0c2..0000000
--- a/src/main/java/com/casic/accessControl/feature/domain/Feature.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.casic.accessControl.feature.domain;
-
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-
-import javax.persistence.*;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-//点的信息
-@Entity
-@Table(name = "feature")
-public class Feature {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private Long id;
-    @Column(name = "longitude")
-    private Double longitude;
-    @Column(name = "latitude")
-    private Double latitude;
-    @Column(name = "featureName")
-    private String featureName;
-    @Column(name = "type")
-    private int type;
-    @Column(name = "isValid")
-    private Integer isValid;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "parent")
-    private Feature parent;
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "parent")
-    private List<Feature> children;
-    @Column(name = "memo")
-    private String memo;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "owner", referencedColumnName = "id")
-    private User owner;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "company", referencedColumnName = "id")
-    private Company company;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer isValid() {
-        return isValid;
-    }
-
-    public void setValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public Feature getParent() {
-        return parent;
-    }
-
-    public void setParent(Feature parent) {
-        this.parent = parent;
-    }
-
-    public List<Feature> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<Feature> children) {
-        this.children = children;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public User getOwner() {
-        return owner;
-    }
-
-    public void setOwner(User owner) {
-        this.owner = owner;
-    }
-
-    public Company getCompany() {
-        return company;
-    }
-
-    public void setCompany(Company company) {
-        this.company = company;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java b/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
deleted file mode 100644
index 256f261..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import com.casic.accessControl.feature.domain.Feature;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/17.
- */
-public class FeatureDto {
-    private Long id;
-    private Double longitude;
-    private Double latitude;
-    private String featureName;
-    private int type;
-    private Integer isValid;
-    private String memo;
-    private Long parentId;
-
-    private String btnEdit = "<a href='#' class='btn mini blue'><i class='icon-edit'></i>编辑</a>";
-    private String btnDelete = "<a href='#' class='btn mini red'><i class='icon-trash'></i>删除</a>";
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer getIsValid() {
-        return isValid;
-    }
-
-    public void setIsValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public Long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getBtnEdit() {
-        return btnEdit;
-    }
-
-    public void setBtnEdit(String btnEdit) {
-        this.btnEdit = btnEdit;
-    }
-
-    public String getBtnDelete() {
-        return btnDelete;
-    }
-
-    public void setBtnDelete(String btnDelete) {
-        this.btnDelete = btnDelete;
-    }
-
-    public static FeatureDto convert2FeatureDto(Feature feature) {
-        if (feature == null) {
-            return null;
-        }
-        FeatureDto featureDto = new FeatureDto();
-        featureDto.setId(feature.getId());
-        featureDto.setFeatureName(feature.getFeatureName());
-        featureDto.setIsValid(feature.isValid());
-        featureDto.setLatitude(feature.getLatitude());
-        featureDto.setLongitude(feature.getLongitude());
-        featureDto.setMemo(feature.getMemo());
-        featureDto.setType(feature.getType());
-        if (feature.getParent() != null)
-            featureDto.setParentId(feature.getParent().getId());
-        return featureDto;
-    }
-
-    public static List<FeatureDto> convert2FeatureDtos(List<Feature> features) {
-        List<FeatureDto> featureDtos = new ArrayList<FeatureDto>();
-        for (Feature feature : features) {
-            featureDtos.add(convert2FeatureDto(feature));
-        }
-        return featureDtos;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java b/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
deleted file mode 100644
index 785dcba..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/19.
- */
-public class OrgDto {
-    private long id;
-
-    private String name;
-
-    private long parentId;
-
-    private List<OrgDto> children = new ArrayList<OrgDto>();
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(long parentId) {
-        this.parentId = parentId;
-    }
-
-    public List<OrgDto> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<OrgDto> children) {
-        this.children = children;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java b/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
deleted file mode 100644
index a475e21..0000000
--- a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
+++ /dev/null
@@ -1,316 +0,0 @@
-package com.casic.accessControl.feature.manager;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.core.page.Page;
-import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.marker.manager.MarkerManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.DataTableParameter;
-import com.casic.accessControl.util.DataTableUtils;
-import org.apache.commons.collections.CollectionUtils;
-import org.hibernate.Criteria;
-import org.hibernate.Query;
-import org.hibernate.criterion.Restrictions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.jdbc.object.SqlQuery;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-@Service
-public class FeatureManager extends HibernateEntityDao<Feature> {
-
-    private Logger logger = LoggerFactory.getLogger(this.getClass());
-    @Resource
-    private MarkerManager markerManager;
-
-
-    public Feature getFeatureById(Long id) {
-        Feature feature = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("id", id)).add(Restrictions.eq("isValid", 1));
-            feature = (Feature) criteria.list().get(0);
-        } catch (Exception e) {
-            return null;
-        }
-        return feature;
-    }
-
-    public FeatureDto getFeatureDtoById(Long id) {
-        return FeatureDto.convert2FeatureDto(getFeatureById(id));
-    }
-
-    /**
-     * 根据id，软删除某个点或线或片
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param ids 多个id
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public String invalidFeature(String ids) {
-        if (StringUtils.isBlank(ids) || ids.indexOf(")") != -1) {//未传入值，直接返回，防止无效查询,过滤非法请求，防止sql注入
-            return "";
-        }
-        String[] idsArr = ids.split(",");
-        StringBuilder canDeleteIds = new StringBuilder("");
-        StringBuilder cantDeleleIds = new StringBuilder("");
-        //找出能删除的和不能删除的id组合
-        for (String id : idsArr) {
-            Long longId = Long.valueOf(id);
-            if (this.isCanDelete(longId)) {
-                if (canDeleteIds.length() > 0) {
-                    canDeleteIds.append(",");
-                }
-                canDeleteIds.append(id);
-
-            } else {
-                if (cantDeleleIds.length() > 0) {
-                    cantDeleleIds.append(",");
-                }
-                cantDeleleIds.append(id);
-            }
-        }
-
-        String temp1Ids = canDeleteIds.toString();
-        String temp2Ids = cantDeleleIds.toString();
-        if (StringUtils.isNotBlank(temp2Ids)) {//有不能删除的，都不删除
-            return "";
-        }
-        Query query = this.getSession().createQuery("update Feature f set f.isValid = 0 where id in (" + temp1Ids + ")");
-        query.executeUpdate();
-
-        return "success";
-    }
-
-    /**
-     * 判断feature是否可以删除
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param id
-     * @return
-     */
-    private boolean isCanDelete(Long id) {
-        Feature feature = this.getFeatureById(id);
-        if (feature.getParent() == null) {//所有用户共用的根节点不能删除
-            return false;
-        }
-        if (CollectionUtils.isNotEmpty(feature.getChildren())) {
-            for (Feature child : feature.getChildren()) {
-                if (child.isValid() == 1) {
-                    return false;
-                }
-            }
-
-        }
-        List<Marker> markers = markerManager.getMarkerByFeature(feature);
-        if (CollectionUtils.isNotEmpty(markers)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * 将数据库中的feature信息按照参数更新
-     *
-     * @param feature
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public void saveOrupdateFeature(Feature feature, User user) {
-        this.getSession().saveOrUpdate(feature);
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param user 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByUser")
-    public List<FeatureDto> getFeaturesByUser(Integer type, User user) {
-        if (user == null) {
-            return Collections.emptyList();
-        }
-        Company company = user.getCompany();
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("type", type));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-        return FeatureDto.convert2FeatureDtos(features);
-    }
-
-    /**
-     * 分页使用，datatable获取相应type的feature某页数据
-     *
-     * @param params
-     * @param user
-     * @return
-     */
-    public DataTable<FeatureDto> getPageFeatureListByTye(String params, Feature parent, User user) {
-        DataTable<FeatureDto> result = new DataTable<FeatureDto>();
-        DataTableParameter parameter = DataTableUtils.getDataTableParameterByJsonParam(params);
-        int start = parameter.getiDisplayStart();
-        int pageSize = parameter.getiDisplayLength();
-        int pageNo = (start / pageSize) + 1;
-        Criteria criteria = this.createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        Company company = user.getCompany();
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("isValid", 1)).add(Restrictions.eq("parent", parent));
-        Page page = pagedQuery(criteria, pageNo, pageSize);
-        List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos((List<Feature>) page.getResult());
-        result.setAaData(featureDtos);
-        result.setiTotalDisplayRecords((int) page.getTotalCount());
-        result.setiTotalRecords((int) page.getTotalCount());
-        result.setsEcho(parameter.getsEcho());
-        return result;
-
-
-    }
-
-    /**
-     * 获取层次结构列表,增加缓存
-     *
-     * @param type
-     * @param company
-     * @return
-     */
-    @Cacheable(value = "getOrgList")
-    public String getOrgList(Integer type, Company company) {
-        List<OrgDto> orgDtos = new ArrayList<OrgDto>();
-        List<Feature> features = this.getRootFeatures(type);
-        for (Feature feature : features) {
-            orgDtos.add(this.getChildrenByParentId(feature.getId(), company));
-        }
-        String jsonStr = null;
-        try {
-            jsonStr = new JsonMapper().toJson(orgDtos);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return jsonStr;
-    }
-
-    //    @Cacheable(value = "getChildrenByParentId", key = "#id")
-    public OrgDto getChildrenByParentId(Long id, Company company) {
-        if (id == null) {
-            return null;
-        }
-        Feature feature = getFeatureById(id);
-        if (feature == null) {
-            return null;
-        }
-        //创建OrgDto节点
-        OrgDto orgDto = new OrgDto();
-        orgDto.setId(id); //保存ID信息
-        orgDto.setName(feature.getFeatureName());
-        if (feature.getParent() != null) {
-            orgDto.setParentId(feature.getParent().getId());
-        }
-        List<Feature> departments = this.getActiveChildrenOrgs(feature, company);
-        for (Feature fea : departments) {
-            orgDto.getChildren().add(this.getChildrenByParentId(fea.getId(), company));
-        }
-        return orgDto;
-    }
-
-    //    @Cacheable(value = "getActiveChildrenOrgs", key = "#department.getId()")
-    private List<Feature> getActiveChildrenOrgs(Feature department, Company company) {
-        List<Feature> features = new ArrayList<Feature>();
-        for (Feature feature : department.getChildren()) {
-            if (feature.isValid() == 1 && feature.getCompany().getId().equals(company.getId())) {
-                features.add(feature);
-            }
-        }
-        return features;
-    }
-
-
-    public List<Feature> getRootFeatures(Integer type) {
-        List<Feature> features = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("type", type)).add(Restrictions.isNull("parent"));
-            features = criteria.list();
-        } catch (Exception e) {
-            return Collections.emptyList();
-        }
-        return features;
-
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param company 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByCompany", key = "#company.getId()")
-    public List<Feature> getFeaturesByCompany(Company company) {
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-        criteria.add(Restrictions.eq("company", company));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-
-        for (Feature f : features) {
-            f.getChildren().toString();
-            f.getOwner().toString();
-            if (f.getParent() != null)
-                f.getParent().toString();
-        }
-        return features;
-    }
-
-    /**
-     * 根据组织结构的id获取叶子节点
-     ***重要：**已更改为包含本节点****
-     * @param type
-     * @param feature
-     * @return
-     */
-    public List<Feature> getLeafByParentId(Integer type, Feature feature) {
-        if (feature == null || feature.isValid() == 0) return Collections.emptyList();
-        List<Feature> features = new ArrayList<Feature>();
-        if (CollectionUtils.isEmpty(feature.getChildren())) {
-            features.add(feature);
-            return features;
-        }
-        List<Feature> children = feature.getChildren();
-        boolean flag = false;
-        for (Feature child : children) {
-            if (child.isValid() == 1) {
-                flag = true;
-                features.addAll(getLeafByParentId(type, child));
-            }
-        }
-//        if (!flag) {//没有有效的子节点
-            features.add(feature);
-//        }
-        return features;
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java b/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
deleted file mode 100644
index a706a36..0000000
--- a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package com.casic.accessControl.feature.web;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.Role;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.CompanyManager;
-import com.casic.accessControl.user.manager.UserManager;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.StringUtils;
-import com.casic.accessControl.xls.Common;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import sun.org.mozilla.javascript.internal.EcmaError;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.IOException;
-import java.util.*;
-
-/**
- * 提供http访问接口
- * Created by lenovo on 2016/5/16.
- */
-@Controller
-@RequestMapping(value = "feature")
-public class FeatureController {
-    @Autowired
-    private FeatureManager featureManager;
-    @Autowired
-    private UserManager userManager;
-    @Autowired
-    private CompanyManager companyManager;
-
-    @RequestMapping(value = "org-list")
-    @ResponseBody
-    public String getOrgList(@RequestParam(required = true) Integer type, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Company company = user.getCompany();
-        return featureManager.getOrgList(type, company);
-    }
-
-    @RequestMapping(value = "org-list-na")
-    @ResponseBody
-    public Map<String, String> getOrgListNa(@RequestParam Long userId) {//na端所有传过来的userid都是公司id
-        Map<String, String> res = new HashMap<String, String>();
-        res.put("message", "列表获取失败");
-        try {
-//            User user = userManager.getUserById(userId);//获取当前登录用户
-//            Company company = user.getCompany();
-            Company company = companyManager.getCompanyById(userId);
-            String areas = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.AREA.getIndex(), company);
-            String lines = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.LINE.getIndex(), company);
-            res.put("feature", areas);
-            res.put("line", lines);
-        } catch (Exception e) {
-            return res;
-        }
-        res.put("message", "成功获取");
-        return res;
-    }
-
-    @RequestMapping(value = "getFeature")
-    @ResponseBody
-    public Map<String, Object> getFeaturesByUser(@RequestParam(required = true) Integer type, HttpSession session) {
-
-        Map<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        List<FeatureDto> list = featureManager.getFeaturesByUser(type, user);
-        if (list == null) {//获取列表失败
-            result.put("message", "获取列表出现错误");
-            return result;
-        } else {
-            result.put("data", list);
-            result.put("message", "获取列表成功");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "getSubFeatureList")
-    public void getSubFeatureList(@RequestParam(required = true) String jsonParams, @RequestParam(required = false) Long parentId, HttpServletResponse response, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Feature parent = featureManager.getFeatureById(parentId);
-        DataTable<FeatureDto> dtoDataTable = featureManager.getPageFeatureListByTye(jsonParams, parent, user);
-        Gson gson = new Gson();
-        String json = gson.toJson(dtoDataTable);
-        response.setCharacterEncoding("utf-8");
-        try {
-            response.getWriter().write(json);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @RequestMapping(value = "delete")
-    @ResponseBody
-    public Map<String, Object> deleteFeatureById(@RequestParam(required = true) Long id, HttpSession session) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        try {
-            String res = featureManager.invalidFeature(id.toString());
-            if (StringUtils.isBlank(res)) {
-                result.put("message", "删除失败");
-            } else {
-                result.put("message", "删除成功");
-                result.put("success", true);
-            }
-        } catch (Exception e) {
-            result.put("message", "删除失败");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "save")
-    @ResponseBody
-    public Map<String, Object> save(@RequestParam(required = true) String params, HttpSession session) {
-        Gson gson = new Gson();
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        Map markers = gson.fromJson(params, HashMap.class);
-        String featureName = (String) markers.get("featureName");
-        String memo = (String) markers.get("memo") == null ? "" : (String) markers.get("memo");
-        Long parentId = Long.valueOf(StringUtils.isBlank((String) markers.get("parentId")) ? "-1" : (String) markers.get("parentId"));//不知为什么转过来为Double
-        Long id = Long.valueOf(StringUtils.isBlank((String) markers.get("id")) ? "-1" : (String) markers.get("id"));
-
-
-        if (StringUtils.isBlank(featureName) || parentId.equals(-1L)) {
-            result.put("message", "必要参数未传送");
-            return result;
-        }
-        Feature feature = new Feature();
-        feature.setValid(1);
-        Feature parent = featureManager.getFeatureById(parentId);
-        feature.setParent(parent);
-        feature.setFeatureName(featureName);
-        feature.setMemo(memo);
-        feature.setOwner(user);
-        feature.setCompany(user.getCompany());
-        feature.setType(parent.getType());
-        if (!id.equals(-1L)) {
-            feature.setId(id);
-        }
-        try {
-            featureManager.saveOrupdateFeature(feature, user);
-            result.put("message", "保存成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "保存失败");
-        }
-        return result;
-
-    }
-
-
-    @RequestMapping(value = "getFeatureById")
-    @ResponseBody
-    public Map<String, Object> getFeatureById(@RequestParam(required = true) Long id) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        try {
-            FeatureDto feature = featureManager.getFeatureDtoById(id);
-            result.put("data", feature);
-            result.put("message", "获取成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "获取失败");
-        }
-        return result;
-
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
index 08a290e..3f53635 100644
--- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
+++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
@@ -1,6 +1,6 @@
 package com.casic.accessControl.marker.dto;
 
-import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.domain.Feature;
 import com.casic.accessControl.marker.domain.Marker;
 import org.apache.commons.collections.CollectionUtils;
 
diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
index 080b291..7fe7434 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -4,8 +4,6 @@
 import com.casic.accessControl.core.hibernate.HibernateEntityDao;
 import com.casic.accessControl.core.page.Page;
 import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.user.domain.Company;
@@ -49,9 +47,6 @@
 public class MarkerManager extends HibernateEntityDao<Marker> {
 
     @Resource
-    private FeatureManager featureManager;
-
-    @Resource
     private UserManager userInfoManager;
 
 
@@ -154,33 +149,33 @@
 
     //获取marker
 //    @Cacheable(value = "getMarkerByFeature", key = "#feature.getId()")
-    public List<Marker> getMarkerByFeature(Feature feature) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            criteria.add(Restrictions.eq("belongLine", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            criteria.add(Restrictions.eq("belongLine", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
-    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
-            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
+//            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
     public boolean saveMarker(Marker marker) {
         try {
@@ -465,7 +460,7 @@
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setLayStyle(sheet.getCell(indexMap.get("layStyle"), i).getContents());
-                } else if(recordTypeFlag == 4) {
+                } else if (recordTypeFlag == 4) {
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setBelowType(sheet.getCell(indexMap.get("belowType"), i).getContents());
diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
index a19f2f5..7675e1f 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -2,9 +2,6 @@
 
 import com.casic.accessControl.core.ext.export.CsvExportor;
 import com.casic.accessControl.core.ext.export.TableModel;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.manager.MarkerManager;
diff --git a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java b/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
deleted file mode 100644
index e69de29..0000000
--- a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
+++ /dev/null
diff --git a/src/main/java/com/casic/accessControl/rs/FeatureResource.java b/src/main/java/com/casic/accessControl/rs/FeatureResource.java
index 68aeb97..e97f18b 100644
--- a/src/main/java/com/casic/accessControl/rs/FeatureResource.java
+++ b/src/main/java/com/casic/accessControl/rs/FeatureResource.java
@@ -1,65 +1,65 @@
-package com.casic.accessControl.rs;
-
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.UserManager;
-import com.google.gson.Gson;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import javax.annotation.Resource;
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
-* Created by admin on 2015/1/15.
-*/
-@Component
-@Path("feature")
-public class FeatureResource
-{
-    private static Logger logger = LoggerFactory.getLogger(FeatureResource.class);
-
-    @Resource
-    private UserManager userManager;
-
-    @Resource
-    private FeatureManager featureManager;
-
-    @GET
-    @Path("get")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map get(@QueryParam("userName") String userName ){
-        Map map = new HashMap<String, Object>();
-        try {
-            User user = userManager.getUserByName(userName);
-            if (user == null) {
-                map.put("success", "false");
-                map.put("message", "人员不存在！");
-                return map;
-            }
-            Company company = user.getCompany();
-            if (company!=null)
-            {
-                List<Feature> features = featureManager.getFeaturesByCompany(company);
-                List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos(features);
-                map.put("success", "true");
-                map.put("message", featureDtos);
-            }
-        }
-        catch (Exception e)
-        {
-            map.put("success", "false");
-            map.put("message", e.getMessage());
-        }
-        return  map;
-    }
-}
+//package com.casic.accessControl.rs;
+//
+//import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.dto.FeatureDto;
+//import com.casic.accessControl.feature.manager.FeatureManager;
+//import com.casic.accessControl.user.domain.Company;
+//import com.casic.accessControl.user.domain.User;
+//import com.casic.accessControl.user.manager.UserManager;
+//import com.google.gson.Gson;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.stereotype.Component;
+//import org.springframework.web.bind.annotation.RequestParam;
+//
+//import javax.annotation.Resource;
+//import javax.ws.rs.*;
+//import javax.ws.rs.core.MediaType;
+//import java.util.HashMap;
+//import java.util.List;
+//import java.util.Map;
+//
+///**
+//* Created by admin on 2015/1/15.
+//*/
+//@Component
+//@Path("feature")
+//public class FeatureResource
+//{
+//    private static Logger logger = LoggerFactory.getLogger(FeatureResource.class);
+//
+//    @Resource
+//    private UserManager userManager;
+//
+//    @Resource
+//    private FeatureManager featureManager;
+//
+//    @GET
+//    @Path("get")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public Map get(@QueryParam("userName") String userName ){
+//        Map map = new HashMap<String, Object>();
+//        try {
+//            User user = userManager.getUserByName(userName);
+//            if (user == null) {
+//                map.put("success", "false");
+//                map.put("message", "人员不存在！");
+//                return map;
+//            }
+//            Company company = user.getCompany();
+//            if (company!=null)
+//            {
+//                List<Feature> features = featureManager.getFeaturesByCompany(company);
+//                List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos(features);
+//                map.put("success", "true");
+//                map.put("message", featureDtos);
+//            }
+//        }
+//        catch (Exception e)
+//        {
+//            map.put("success", "false");
+//            map.put("message", e.getMessage());
+//        }
+//        return  map;
+//    }
+//}
diff --git a/src/main/java/com/casic/accessControl/rs/MapInfo.java b/src/main/java/com/casic/accessControl/rs/MapInfo.java
deleted file mode 100644
index a77fce9..0000000
--- a/src/main/java/com/casic/accessControl/rs/MapInfo.java
+++ /dev/null
@@ -1,131 +0,0 @@
-//package com.casic.accessControl.rs;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-///**
-// * Created by admin on 2015/8/26.
-// */
-//public class MapInfo {
-//
-//    private String mapUrl;
-//
-//    private String updateTime;
-//
-//    private String uploader;
-//
-//    private String name;
-//
-//    private String uuid;
-//
-//    private String site;
-//    /*
-//    0:草稿
-//    1：待审核
-//    2：通过
-//    3: 驳回
-//     */
-//    private String status;
-//
-//    //
-//    private int id;
-//
-//
-//    public String getMapUrl()
-//    {
-//        return mapUrl;
-//    }
-//
-//    public void setMapUrl(String mapUrl)
-//    {
-//        this.mapUrl = mapUrl;
-//    }
-//
-//    public String getUpdateTime()
-//    {
-//        return updateTime;
-//    }
-//
-//    public void setUpdateTime(String updateTime)
-//    {
-//        this.updateTime = updateTime;
-//    }
-//
-//    public String getUploader()
-//    {
-//        return uploader;
-//    }
-//
-//    public void setUploader(String uploader)
-//    {
-//        this.uploader = uploader;
-//    }
-//
-//    public String getName()
-//    {
-//        return name;
-//    }
-//
-//    public void setName(String name)
-//    {
-//        this.name = name;
-//    }
-//
-//    public String getUuid()
-//    {
-//        return uuid;
-//    }
-//
-//    public void setUuid(String uuid)
-//    {
-//        this.uuid = uuid;
-//    }
-//
-//    public String getSite()
-//    {
-//        return site;
-//    }
-//
-//    public void setSite(String site)
-//    {
-//        this.site = site;
-//    }
-//
-//    public String getStatus()
-//    {
-//        return status;
-//    }
-//
-//    public void setStatus(String status)
-//    {
-//        this.status = status;
-//    }
-//
-//    public int getId()
-//    {
-//        return id;
-//    }
-//
-//    public void setId(int id)
-//    {
-//        this.id = id;
-//    }
-//
-//    public static List<MapInfo> getMockerMaps()
-//    {
-//        List<MapInfo> maps = new ArrayList<MapInfo>();
-//        for (int i = 0; i < 20; i++)
-//        {
-//            MapInfo map = new MapInfo();
-//            map.setId(i);
-//            map.setUploader("张帆");
-//            map.setMapUrl("http://192.168.0.111:9080/accessControl/logo.jpg");
-//            map.setSite("永旺路"+i);
-//            map.setUpdateTime("2015-08-02");
-//            map.setStatus("待审核");
-//            maps.add(map);
-//        }
-//        return maps;
-//
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/rs/MarkResource.java b/src/main/java/com/casic/accessControl/rs/MarkResource.java
index 8ae4d85..cef1580 100644
--- a/src/main/java/com/casic/accessControl/rs/MarkResource.java
+++ b/src/main/java/com/casic/accessControl/rs/MarkResource.java
@@ -1,7 +1,7 @@
 package com.casic.accessControl.rs;
 
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
+//import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.manager.MarkerManager;
 import com.casic.accessControl.user.domain.Company;
@@ -35,8 +35,8 @@
     @Resource
     private MarkerManager markerManager;
 
-    @Resource
-    private FeatureManager featureManager;
+//    @Resource
+//    private FeatureManager featureManager;
 
     @GET
     @Path("post")
diff --git a/src/main/java/com/casic/accessControl/rs/UserObj.java b/src/main/java/com/casic/accessControl/rs/UserObj.java
deleted file mode 100644
index c0fe651..0000000
--- a/src/main/java/com/casic/accessControl/rs/UserObj.java
+++ /dev/null
@@ -1,61 +0,0 @@
-//package com.casic.accessControl.rs;
-//
-//import java.io.Serializable;
-//
-///**
-// * Created by admin on 2015/10/9.
-// */
-//public class UserObj implements Serializable {
-//    private String userName;
-//    private String password;
-//    private String appId;
-//    /*
-//    roles:��ɫ֮���Զ��ŷָ�
-//     */
-//    private String roles;
-//
-//    /*
-//    authorities:Ȩ��֮���Զ��ŷָ�
-//    */
-//    private String authorities;
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public String getPassword() {
-//        return password;
-//    }
-//
-//    public void setPassword(String password) {
-//        this.password = password;
-//    }
-//
-//    public String getAppId() {
-//        return appId;
-//    }
-//
-//    public void setAppId(String appId) {
-//        this.appId = appId;
-//    }
-//
-//    public String getRoles() {
-//        return roles;
-//    }
-//
-//    public void setRoles(String roles) {
-//        this.roles = roles;
-//    }
-//
-//    public String getAuthorities() {
-//        return authorities;
-//    }
-//
-//    public void setAuthorities(String authorities) {
-//        this.authorities = authorities;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java b/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java
deleted file mode 100644
index ac60ed5..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java
+++ /dev/null
@@ -1,65 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//import org.geotools.referencing.operation.transform.NADCONTransform;
-//
-//import javax.persistence.*;
-//
-///**
-// * Created by test203 on 2015/10/29.
-// */
-//@Entity
-//@Table(name = "ZX_DATABASE_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_DATABASE_INFO_ID", sequenceName = "SEQ_ZX_DATABASE_INFO_ID", allocationSize = 1, initialValue = 1)
-//public class DataBaseInfo {
-//    private Long id;
-//    private String account;
-//    private String password;
-//    private String sid;
-//    private String owner;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_ZX_DATABASE_INFO_ID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "ACCOUNT", nullable = false)
-//    public String getAccount() {
-//        return account;
-//    }
-//
-//    public void setAccount(String account) {
-//        this.account = account;
-//    }
-//
-//    @Column(name = "PASSWORD", nullable = false)
-//    public String getPassword() {
-//        return password;
-//    }
-//
-//    public void setPassword(String password) {
-//        this.password = password;
-//    }
-//
-//    @Column(name = "SID", nullable = false)
-//    public String getSid() {
-//        return sid;
-//    }
-//
-//    public void setSid(String sid) {
-//        this.sid = sid;
-//    }
-//
-//    @Column(name = "OWNER", nullable = false)
-//    public String getOwner() {
-//        return owner;
-//    }
-//
-//    public void setOwner(String owner) {
-//        this.owner = owner;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java b/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java
deleted file mode 100644
index 9578060..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java
+++ /dev/null
@@ -1,77 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//import com.casic.accessControl.org.domain.UserInfo;
-//
-//import javax.persistence.*;
-//import java.util.Date;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Entity
-//@Table(name = "ZX_ORCL_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_ORCL_INFO_ID",sequenceName = "SEQ_ZX_ORCL_INFO_ID",allocationSize = 1,initialValue = 1)
-//public class OrclInfo {
-//    private Long id;
-//    private String fileName;
-//    private String filePath;
-//    private String memo;
-//    private Date bkDay = new Date();
-//    private UserInfo userInfo;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE,generator = "SEQ_ZX_ORCL_INFO_ID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "FILE_NAME",nullable = false)
-//    public String getFileName() {
-//        return fileName;
-//    }
-//
-//    public void setFileName(String fileName) {
-//        this.fileName = fileName;
-//    }
-//
-//    @Column(name = "FILE_PATH",nullable = false)
-//    public String getFilePath() {
-//        return filePath;
-//    }
-//
-//    public void setFilePath(String filePath) {
-//        this.filePath = filePath;
-//    }
-//
-//    @Column(name = "MEMO")
-//    public String getMemo() {
-//        return memo;
-//    }
-//
-//    public void setMemo(String memo) {
-//        this.memo = memo;
-//    }
-//
-//    @Column(name = "BK_DAY")
-//    public Date getBkDay() {
-//        return bkDay;
-//    }
-//
-//    public void setBkDay(Date bkDay) {
-//        this.bkDay = bkDay;
-//    }
-//
-//    @ManyToOne(fetch = FetchType.LAZY)
-//    @JoinColumn(name = "USER_ID")
-//    public UserInfo getUserInfo() {
-//        return userInfo;
-//    }
-//
-//    public void setUserInfo(UserInfo userInfo) {
-//        this.userInfo = userInfo;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/SysLogInfo.java b/src/main/java/com/casic/accessControl/sys/domain/SysLogInfo.java
deleted file mode 100644
index 60e5583..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/SysLogInfo.java
+++ /dev/null
@@ -1,70 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//
-//import com.casic.accessControl.user.domain.UserInfo;
-//
-//import javax.persistence.*;
-//import java.io.Serializable;
-//import java.util.Date;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Entity
-//@Table(name = "ZX_SYS_LOG_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_SYS_LOG_ID",sequenceName = "SEQ_ZX_SYS_LOG_ID",allocationSize = 1,initialValue = 1)
-//public class SysLogInfo implements Serializable{
-//    private Long id;
-//    private String logType;//系统日志、运行日志、操作日志
-//    private String msg;
-//    private Date logDay = new Date();
-//    private UserInfo user;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE,generator = "SEQ_ZX_SYS_LOG_ID")
-//    @Column(name = "DBID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "LOG_TYPE",nullable = false)
-//    public String getLogType() {
-//        return logType;
-//    }
-//
-//    public void setLogType(String logType) {
-//        this.logType = logType;
-//    }
-//
-//    @Column(name = "LOG_MSG",nullable = false)
-//    public String getMsg() {
-//        return msg;
-//    }
-//
-//    public void setMsg(String msg) {
-//        this.msg = msg;
-//    }
-//
-//    @Column(name = "LOG_DAY")
-//    public Date getLogDay() {
-//        return logDay;
-//    }
-//
-//    public void setLogDay(Date logDay) {
-//        this.logDay = logDay;
-//    }
-//
-//    @ManyToOne(fetch = FetchType.LAZY)
-//    @JoinColumn(name = "USER_ID")
-//    public UserInfo getUser() {
-//        return user;
-//    }
-//
-//    public void setUser(UserInfo user) {
-//        this.user = user;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/dto/ExcelInfoDTO.java b/src/main/java/com/casic/accessControl/sys/dto/ExcelInfoDTO.java
deleted file mode 100644
index 2fe496e..0000000
--- a/src/main/java/com/casic/accessControl/sys/dto/ExcelInfoDTO.java
+++ /dev/null
@@ -1,77 +0,0 @@
-//package com.casic.accessControl.sys.dto;
-//
-//import com.casic.accessControl.sys.domain.SysLogInfo;
-//import com.casic.accessControl.util.DateUtils;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-///**
-// * Created by test203 on 2015/10/23.
-// */
-//public class ExcelInfoDTO {
-//    private String logType;//系统日志、运行日志、操作日志
-//    private String msg;
-//    private String logDay;
-//    private String userName;
-//
-//    public String getLogType() {
-//        return logType;
-//    }
-//
-//    public void setLogType(String logType) {
-//        this.logType = logType;
-//    }
-//
-//    public String getMsg() {
-//        return msg;
-//    }
-//
-//    public void setMsg(String msg) {
-//        this.msg = msg;
-//    }
-//
-//    public String getLogDay() {
-//        return logDay;
-//    }
-//
-//    public void setLogDay(String logDay) {
-//        this.logDay = logDay;
-//    }
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public static ExcelInfoDTO ConvertToDTO(SysLogInfo logInfo){
-//        if(null!=logInfo){
-//            ExcelInfoDTO dto = new ExcelInfoDTO();
-//            dto.setLogType(logInfo.getLogType());
-//            if(null!=logInfo.getLogDay()){
-//                dto.setLogDay(DateUtils.sdf2.format(logInfo.getLogDay()));
-//            }else {
-//                dto.setLogDay(" ");
-//            }
-//            dto.setMsg(logInfo.getMsg());
-//            if(null!=logInfo.getUser()){
-//                dto.setUserName(logInfo.getUser().getUserName());
-//            }else {
-//                dto.setUserName(" ");
-//            }
-//            return dto;
-//        }
-//        return new ExcelInfoDTO();
-//    }
-//
-//    public static List<ExcelInfoDTO> ConvertToDTO(List<SysLogInfo> list){
-//        List<ExcelInfoDTO> dtoList = new ArrayList<ExcelInfoDTO>();
-//        for(SysLogInfo log : list){
-//            dtoList.add(ConvertToDTO(log));
-//        }
-//        return dtoList;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/dto/OrclInfoDTO.java b/src/main/java/com/casic/accessControl/sys/dto/OrclInfoDTO.java
deleted file mode 100644
index 46a261d..0000000
--- a/src/main/java/com/casic/accessControl/sys/dto/OrclInfoDTO.java
+++ /dev/null
@@ -1,124 +0,0 @@
-//package com.casic.accessControl.sys.dto;
-//
-//import com.casic.accessControl.org.domain.UserInfo;
-//import com.casic.accessControl.shp.domain.LayerInfo;
-//import com.casic.accessControl.sys.domain.OrclInfo;
-//import com.casic.accessControl.util.DateUtils;
-//
-//import java.util.ArrayList;
-//import java.util.Date;
-//import java.util.List;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//public class OrclInfoDTO {
-//    private Long id;
-//    private String fileName;
-//    private String filePath;
-//    private String memo;
-//    private String bkDay;
-//    private Long userId;
-//    private String userName;
-//    private String btnRestor = "<a href='#' class='btn mini blue'>还原</a>";
-//    private String btnDelete = "<a href='#' class='btn mini red'>删除</a>";
-//
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    public String getFileName() {
-//        return fileName;
-//    }
-//
-//    public void setFileName(String fileName) {
-//        this.fileName = fileName;
-//    }
-//
-//    public String getFilePath() {
-//        return filePath;
-//    }
-//
-//    public void setFilePath(String filePath) {
-//        this.filePath = filePath;
-//    }
-//
-//    public String getMemo() {
-//        return memo;
-//    }
-//
-//    public void setMemo(String memo) {
-//        this.memo = memo;
-//    }
-//
-//    public String getBkDay() {
-//        return bkDay;
-//    }
-//
-//    public void setBkDay(String bkDay) {
-//        this.bkDay = bkDay;
-//    }
-//
-//    public Long getUserId() {
-//        return userId;
-//    }
-//
-//    public void setUserId(Long userId) {
-//        this.userId = userId;
-//    }
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public String getBtnRestor() {
-//        return btnRestor;
-//    }
-//
-//    public void setBtnRestor(String btnRestor) {
-//        this.btnRestor = btnRestor;
-//    }
-//
-//    public String getBtnDelete() {
-//        return btnDelete;
-//    }
-//
-//    public void setBtnDelete(String btnDelete) {
-//        this.btnDelete = btnDelete;
-//    }
-//
-//    public static OrclInfoDTO ConvertToDTO(OrclInfo orcl){
-//        if(null!=orcl){
-//            OrclInfoDTO dto = new OrclInfoDTO();
-//            dto.setId(orcl.getId());
-//            dto.setFileName(orcl.getFileName());
-//            dto.setFilePath(orcl.getFilePath());
-//            dto.setMemo(orcl.getMemo());
-//            if(null!=orcl.getBkDay()){
-//                dto.setBkDay(DateUtils.sdf1.format(orcl.getBkDay()));
-//            }
-//            if(null!=orcl.getUserInfo()){
-//                dto.setUserId(orcl.getUserInfo().getId());
-//                dto.setUserName(orcl.getUserInfo().getUsername());
-//            }
-//            return dto;
-//        }
-//        return new OrclInfoDTO();
-//    }
-//
-//    public static List<OrclInfoDTO> ConvertToDTO(List<OrclInfo> list){
-//        List<OrclInfoDTO> dtoList = new ArrayList<OrclInfoDTO>();
-//        for(OrclInfo orcl : list){
-//            dtoList.add(ConvertToDTO(orcl));
-//        }
-//        return dtoList;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/dto/SysLogInfoDTO.java b/src/main/java/com/casic/accessControl/sys/dto/SysLogInfoDTO.java
deleted file mode 100644
index 64d6c39..0000000
--- a/src/main/java/com/casic/accessControl/sys/dto/SysLogInfoDTO.java
+++ /dev/null
@@ -1,103 +0,0 @@
-//package com.casic.accessControl.sys.dto;
-//
-//import com.casic.accessControl.sys.domain.SysLogInfo;
-//import com.casic.accessControl.util.DateUtils;
-//
-//import java.util.ArrayList;
-//import java.util.Date;
-//import java.util.List;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//public class SysLogInfoDTO {
-//    private Long id;
-//    private String logType;//系统日志、运行日志、操作日志
-//    private String msg;
-//    private String logDay;
-//    private Long userId;
-//    private String userName;
-//    private String btn = "<a href='#' class='btn mini blue'>查看</a>";
-//
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    public String getLogType() {
-//        return logType;
-//    }
-//
-//    public void setLogType(String logType) {
-//        this.logType = logType;
-//    }
-//
-//    public String getMsg() {
-//        return msg;
-//    }
-//
-//    public void setMsg(String msg) {
-//        this.msg = msg;
-//    }
-//
-//    public String getLogDay() {
-//        return logDay;
-//    }
-//
-//    public void setLogDay(String logDay) {
-//        this.logDay = logDay;
-//    }
-//
-//    public Long getUserId() {
-//        return userId;
-//    }
-//
-//    public void setUserId(Long userId) {
-//        this.userId = userId;
-//    }
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public String getBtn() {
-//        return btn;
-//    }
-//
-//    public void setBtn(String btn) {
-//        this.btn = btn;
-//    }
-//
-//    public static SysLogInfoDTO ConvertToDTO(SysLogInfo log){
-//        if(null!=log){
-//            SysLogInfoDTO dto = new SysLogInfoDTO();
-//            dto.setId(log.getId());
-//            dto.setLogType(log.getLogType());
-//            if(null!=log.getLogDay()){
-//                dto.setLogDay(DateUtils.sdf2.format(log.getLogDay()));
-//            }
-//            dto.setMsg(log.getMsg());
-//            if(null!=log.getUser()){
-//                dto.setUserId(log.getUser().getId());
-//                dto.setUserName(log.getUser().getUserName());
-//            }
-//            return dto;
-//        }
-//        return new SysLogInfoDTO();
-//    }
-//
-//    public static List<SysLogInfoDTO> ConvertToDTO(List<SysLogInfo> list){
-//        List<SysLogInfoDTO> dtoList = new ArrayList<SysLogInfoDTO>();
-//        for(SysLogInfo log : list){
-//            dtoList.add(ConvertToDTO(log));
-//        }
-//        return dtoList;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/manager/DataBaseInfoManager.java b/src/main/java/com/casic/accessControl/sys/manager/DataBaseInfoManager.java
deleted file mode 100644
index b1395e6..0000000
--- a/src/main/java/com/casic/accessControl/sys/manager/DataBaseInfoManager.java
+++ /dev/null
@@ -1,19 +0,0 @@
-//package com.casic.accessControl.sys.manager;
-//
-//import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-//import com.casic.accessControl.sys.domain.DataBaseInfo;
-//import org.hibernate.Criteria;
-//import org.springframework.stereotype.Service;
-//
-///**
-// * Created by test203 on 2015/10/29.
-// */
-//@Service
-//public class DataBaseInfoManager extends HibernateEntityDao<DataBaseInfo>{
-//    public Criteria getCriteria(){
-//        return  getSession().createCriteria(DataBaseInfo.class);
-//    }
-//    public Object getDataBaseInfo(){
-//        return getCriteria().uniqueResult();
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/manager/OrclInfoManager.java b/src/main/java/com/casic/accessControl/sys/manager/OrclInfoManager.java
deleted file mode 100644
index d9804a1..0000000
--- a/src/main/java/com/casic/accessControl/sys/manager/OrclInfoManager.java
+++ /dev/null
@@ -1,127 +0,0 @@
-//package com.casic.accessControl.sys.manager;
-//
-//import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-//import com.casic.accessControl.core.page.Page;
-//import com.casic.accessControl.sys.domain.DataBaseInfo;
-//import com.casic.accessControl.sys.domain.OrclInfo;
-//import com.casic.accessControl.sys.dto.OrclInfoDTO;
-//import com.casic.accessControl.util.*;
-//import org.hibernate.Criteria;
-//import org.hibernate.criterion.Order;
-//import org.hibernate.criterion.Restrictions;
-//import org.springframework.jdbc.core.JdbcTemplate;
-//import org.springframework.stereotype.Service;
-//
-//import javax.annotation.Resource;
-//import java.io.File;
-//import java.io.IOException;
-//import java.text.ParseException;
-//import java.util.*;
-//
-///**
-//* Created by Administrator on 2015/8/17.
-//*/
-//@Service
-//public class OrclInfoManager extends HibernateEntityDao<OrclInfo> {
-//    @Resource
-//    private DataBaseInfoManager dataBaseInfoManager;
-//
-//    public void setDataBaseInfoManager(DataBaseInfoManager dataBaseInfoManager) {
-//        this.dataBaseInfoManager = dataBaseInfoManager;
-//    }
-//
-//    public Criteria getCriteria() {
-//        return getSession().createCriteria(OrclInfo.class);
-//    }
-//
-//    public DataTable<OrclInfoDTO> pageQueryOrclInfoDTO(String jsonParam, String beginDay, String endDay) throws ParseException {
-//        DataTableParameter dataTableParam = DataTableUtils.getDataTableParameterByJsonParam(jsonParam);
-//
-//        int start = dataTableParam.getiDisplayStart();
-//        int pageSize = dataTableParam.getiDisplayLength();
-//        int pageNo = (start / pageSize) + 1;
-//
-//        Criteria criteria = getCriteria();
-//        criteria.addOrder(Order.desc("id"));
-//
-//        if (StringUtils.isNotBlank(beginDay)) {
-//            criteria.add(Restrictions.ge("bkDay", DateUtils.sdf1.parse(beginDay)));
-//        }
-//        if (StringUtils.isNotBlank(endDay)) {
-//            Date date = DateUtils.sdf1.parse(endDay);
-//            Calendar calendar = Calendar.getInstance();
-//            calendar.setTime(date);
-//            calendar.add(Calendar.DATE, 1);
-//            criteria.add(Restrictions.le("bkDay", calendar.getTime()));
-//        }
-//
-//        Page page = pagedQuery(criteria, pageNo, pageSize);
-//
-//        List<OrclInfoDTO> dtoList = OrclInfoDTO.ConvertToDTO((List<OrclInfo>) page.getResult());
-//        DataTable<OrclInfoDTO> dt = new DataTable<OrclInfoDTO>();
-//        dt.setAaData(dtoList);
-//        dt.setiTotalDisplayRecords((int) page.getTotalCount());
-//        dt.setsEcho(dataTableParam.getsEcho());
-//        dt.setiTotalRecords((int) page.getTotalCount());
-//        return dt;
-//    }
-//
-//    public Map<String, Object> backupDB(String memo, String path) throws IOException, InterruptedException {
-//        Map<String, Object> map = new HashMap<String, Object>();
-//        DataBaseInfo db = (DataBaseInfo) dataBaseInfoManager.getDataBaseInfo();
-//        if (null == db) {
-//            map.put("success", false);
-//            map.put("message", "没有找到数据库配置！");
-//            return map;
-//        }
-//        String fileName = db.getSid() + DateUtils.sdfFile.format(new Date()) + ".dmp";
-//        String filePath = path + "\\" + fileName;
-//
-//        DataBaseUtils.doExp(db.getAccount(), db.getPassword(), db.getSid(), db.getOwner(), filePath);
-//
-//        OrclInfo orcl = new OrclInfo();
-//        orcl.setMemo(memo);
-//        orcl.setFileName(fileName);
-//        orcl.setFilePath(filePath);
-//        save(orcl);
-//
-//        map.put("success", true);
-//        return map;
-//    }
-//
-//    private String dropTables() {
-//        StringBuilder tables = new StringBuilder();
-//        JdbcTemplate jdbcTemplate = getJdbcTemplate();
-//        String sqlString = "SELECT TABLE_NAME FROM USER_TABLES WHERE TABLESPACE_NAME='USERS'";
-//        List<String> list = jdbcTemplate.queryForList(sqlString, java.lang.String.class);
-//        if (list.size() > 0) {
-//            for (String t : list) {
-//                tables.append(t).append(",");
-//                String sql = "DROP TABLE " + t + " CASCADE CONSTRAINTS";
-//                jdbcTemplate.execute(sql);
-//                System.out.println(sql);
-//            }
-//            return tables.deleteCharAt(tables.length() - 1).toString();
-//        }
-//        return "";
-//    }
-//
-//    public void doImp(Long id) throws IOException, InterruptedException {
-//        OrclInfoDTO dto = getDTO(id);
-//        if (StringUtils.isNotBlank(dto.getFilePath())) {
-//            String tbl = dropTables();
-//            DataBaseUtils.doImp("scott", "xxfw", "XXFW", dto.getFilePath(), tbl);
-//        }
-//    }
-//
-//    public OrclInfoDTO getDTO(Long id) {
-//        return OrclInfoDTO.ConvertToDTO(get(id));
-//    }
-//
-//    public void deleteDTO(Long id) {
-//        OrclInfo orcl = get(id);
-//        File file = new File(orcl.getFilePath());
-//        file.delete();
-//        remove(orcl);
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/manager/SysLogInfoManager.java b/src/main/java/com/casic/accessControl/sys/manager/SysLogInfoManager.java
deleted file mode 100644
index a2c83a4..0000000
--- a/src/main/java/com/casic/accessControl/sys/manager/SysLogInfoManager.java
+++ /dev/null
@@ -1,92 +0,0 @@
-//package com.casic.accessControl.sys.manager;
-//
-//
-//import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-//import com.casic.accessControl.core.page.Page;
-//import com.casic.accessControl.sys.domain.SysLogInfo;
-//import com.casic.accessControl.sys.dto.ExcelInfoDTO;
-//import com.casic.accessControl.sys.dto.SysLogInfoDTO;
-//import com.casic.accessControl.util.*;
-//import com.casic.accessControl.xls.ExportExcel;
-//import org.hibernate.Criteria;
-//import org.hibernate.criterion.Order;
-//import org.hibernate.criterion.Restrictions;
-//import org.springframework.stereotype.Service;
-//
-//import java.io.FileOutputStream;
-//import java.io.IOException;
-//import java.io.OutputStream;
-//import java.text.ParseException;
-//import java.util.*;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Service
-//public class SysLogInfoManager extends HibernateEntityDao<SysLogInfo> {
-//
-//    public Criteria getCriteria() {
-//        return getSession().createCriteria(SysLogInfo.class);
-//    }
-//
-//    public DataTable<SysLogInfoDTO> pageQueryLogInfoDTO(String jsonParam, String logType, String beginDay, String endDay) throws ParseException {
-//        DataTableParameter dataTableParam = DataTableUtils.getDataTableParameterByJsonParam(jsonParam);
-//
-//        int start = dataTableParam.getiDisplayStart();
-//        int pageSize = dataTableParam.getiDisplayLength();
-//        int pageNo = (start / pageSize) + 1;
-//
-//        Criteria criteria = getCriteria();
-//        criteria.addOrder(Order.desc("id"));
-//
-//        if (StringUtils.isNotBlank(logType)) {
-//            criteria.add(Restrictions.like("logType", "%" + logType + "%"));
-//        }
-//        if (StringUtils.isNotBlank(beginDay)) {
-//            criteria.add(Restrictions.ge("logDay", DateUtils.sdf1.parse(beginDay)));
-//        }
-//        if (StringUtils.isNotBlank(endDay)) {
-//            Date date = DateUtils.sdf1.parse(endDay);
-//            Calendar calendar = Calendar.getInstance();
-//            calendar.setTime(date);
-//            calendar.add(Calendar.DATE, 1);
-//            criteria.add(Restrictions.le("logDay", calendar.getTime()));
-//        }
-//
-//        Page page = pagedQuery(criteria, pageNo, pageSize);
-//
-//        List<SysLogInfoDTO> dtoList = SysLogInfoDTO.ConvertToDTO((List<SysLogInfo>) page.getResult());
-//        DataTable<SysLogInfoDTO> dt = new DataTable<SysLogInfoDTO>();
-//        dt.setAaData(dtoList);
-//        dt.setiTotalDisplayRecords((int) page.getTotalCount());
-//        dt.setsEcho(dataTableParam.getsEcho());
-//        dt.setiTotalRecords((int) page.getTotalCount());
-//        return dt;
-//    }
-//
-//    public SysLogInfoDTO getDTO(Long id) {
-//        return SysLogInfoDTO.ConvertToDTO(get(id));
-//    }
-//
-//    public Map<String, Object> expSysLogToExcel(String logType, String beginDay, String endDay, String path) throws ParseException, IOException {
-//        Map<String, Object> map = new HashMap<String, Object>();
-//        Criteria criteria = getCriteria();
-//        criteria.add(Restrictions.like("logType", "%" + logType + "%"));
-//        if (StringUtils.isNotBlank(beginDay)) {
-//            criteria.add(Restrictions.ge("logDay", DateUtils.sdf1.parse(beginDay)));
-//        }
-//        if (StringUtils.isNotBlank(endDay)) {
-//            Calendar calendar = Calendar.getInstance();
-//            calendar.setTime(DateUtils.sdf1.parse(endDay));
-//            calendar.add(Calendar.DATE, 1);
-//            criteria.add(Restrictions.le("logDay", calendar.getTime()));
-//        }
-//        List<ExcelInfoDTO> dtoList = ExcelInfoDTO.ConvertToDTO(criteria.list());
-//        String[] headers = {"日志类型", "日志内容", "日期", "操作人"};
-//        OutputStream out = new FileOutputStream(path);
-//        ExportExcel<ExcelInfoDTO> ex = new ExportExcel<ExcelInfoDTO>();
-//        ex.exportExcel(headers, dtoList, out);
-//        map.put("success", true);
-//        return map;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/web/OrclInfoController.java b/src/main/java/com/casic/accessControl/sys/web/OrclInfoController.java
deleted file mode 100644
index 22fa833..0000000
--- a/src/main/java/com/casic/accessControl/sys/web/OrclInfoController.java
+++ /dev/null
@@ -1,96 +0,0 @@
-//package com.casic.accessControl.sys.web;
-//
-//import com.casic.accessControl.core.mapper.JsonMapper;
-//import com.casic.accessControl.sys.dto.OrclInfoDTO;
-//import com.casic.accessControl.sys.dto.SysLogInfoDTO;
-//import com.casic.accessControl.sys.manager.OrclInfoManager;
-//import com.casic.accessControl.util.DataBaseUtils;
-//import com.casic.accessControl.util.DataTable;
-//import com.casic.accessControl.util.DateUtils;
-//import com.casic.accessControl.util.StringUtils;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//
-//import javax.annotation.Resource;
-//import javax.persistence.ManyToOne;
-//import javax.servlet.http.HttpServletRequest;
-//import javax.servlet.http.HttpServletResponse;
-//import javax.servlet.http.HttpSession;
-//import java.util.Date;
-//import java.util.HashMap;
-//import java.util.Map;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Controller
-//@RequestMapping("sys")
-//public class OrclInfoController {
-//
-//    @Resource
-//    private OrclInfoManager orclInfoManager;
-//
-//    public void setOrclInfoManager(OrclInfoManager orclInfoManager) {
-//        this.orclInfoManager = orclInfoManager;
-//    }
-//
-//    @RequestMapping("orcl-info-list")
-//    public void listOrcl(String jsonParam,
-//                         @RequestParam(value = "beginDay", required = false) String beginDay,
-//                         @RequestParam(value = "endDay", required = false) String endDay,
-//                         HttpServletResponse response) {
-//        try {
-//            DataTable<OrclInfoDTO> dt = orclInfoManager.pageQueryOrclInfoDTO(jsonParam, beginDay, endDay);
-//            String json = new JsonMapper().toJson(dt);
-//            response.setCharacterEncoding("utf-8");
-//            response.getWriter().write(json);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//    }
-//
-//    @RequestMapping("orcl-info-save")
-//    @ResponseBody
-//    public Map<String, Object> saveOrcl(String memo, HttpServletRequest request) {
-//        Map<String, Object> map = new HashMap<String, Object>();
-//        try {
-//            String path = request.getSession().getServletContext().getRealPath("content\\dmp");
-//            map = orclInfoManager.backupDB(memo, path);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            map.put("success", false);
-//            map.put("message", "数据备份失败！");
-//        }
-//        return map;
-//    }
-//
-//    @RequestMapping("orcl-info-restore")
-//    @ResponseBody
-//    public Map<String, Object> restoreData(@RequestParam(value = "id", required = true) Long id) {
-//        Map<String, Object> map = new HashMap<String, Object>();
-//        try {
-//            orclInfoManager.doImp(id);
-//            map.put("success", true);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            map.put("success", false);
-//        }
-//        return map;
-//    }
-//
-//    @RequestMapping("orcl-info-delete")
-//    @ResponseBody
-//    public Map<String, Object> deleteOrclInfo(@RequestParam(value = "id", required = true) Long id) {
-//        Map<String, Object> map = new HashMap<String, Object>();
-//        try {
-//            orclInfoManager.deleteDTO(id);
-//            map.put("success", true);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            map.put("success", false);
-//        }
-//        return map;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/web/SysLogInfoController.java b/src/main/java/com/casic/accessControl/sys/web/SysLogInfoController.java
deleted file mode 100644
index 86caa76..0000000
--- a/src/main/java/com/casic/accessControl/sys/web/SysLogInfoController.java
+++ /dev/null
@@ -1,81 +0,0 @@
-//package com.casic.accessControl.sys.web;
-//
-//import com.casic.accessControl.core.ext.mail.MailConsumer;
-//import com.casic.accessControl.core.mapper.JsonMapper;
-//import com.casic.accessControl.sys.domain.SysLogInfo;
-//import com.casic.accessControl.sys.dto.SysLogInfoDTO;
-//import com.casic.accessControl.sys.manager.SysLogInfoManager;
-//import com.casic.accessControl.util.DataTable;
-//import com.casic.accessControl.xls.ExportExcel;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.ui.Model;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//
-//import javax.annotation.Resource;
-//import javax.servlet.http.HttpServletRequest;
-//import javax.servlet.http.HttpServletResponse;
-//import java.io.*;
-//import java.util.ArrayList;
-//import java.util.HashMap;
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Controller
-//@RequestMapping("sys")
-//public class SysLogInfoController {
-//
-//    @Resource
-//    private SysLogInfoManager sysLogInfoManager;
-//
-//    public void setSysLogInfoManager(SysLogInfoManager sysLogInfoManager) {
-//        this.sysLogInfoManager = sysLogInfoManager;
-//    }
-//
-//    @RequestMapping("log-info-list")
-//    public void list(String jsonParam
-//            , @RequestParam(value = "logType", required = false) String logType
-//            , @RequestParam(value = "beginDay", required = false) String beginDay
-//            , @RequestParam(value = "endDay", required = false) String endDay
-//            , HttpServletResponse response) {
-//        try {
-//            DataTable<SysLogInfoDTO> dt = sysLogInfoManager.pageQueryLogInfoDTO(jsonParam, logType, beginDay, endDay);
-//            String json = new JsonMapper().toJson(dt);
-//            response.setCharacterEncoding("utf-8");
-//            response.getWriter().write(json);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//    }
-//
-//    @RequestMapping("sys-log-msg")
-//    public String logMsg(@RequestParam(value = "id", required = true) Long id, Model model) {
-//        SysLogInfoDTO dto = sysLogInfoManager.getDTO(id);
-//        model.addAttribute("model", dto);
-//        return "sys/sys-log-msg";
-//    }
-//
-//    @RequestMapping("exp-sys-log")
-//    @ResponseBody
-//    public Map<String, Object> expSysLog(@RequestParam(value = "logType", required = false) String logType,
-//                                         @RequestParam(value = "beginDay", required = false) String beginDay,
-//                                         @RequestParam(value = "endDay", required = false) String endDay,
-//                                         HttpServletResponse response,
-//                                         HttpServletRequest request) throws IOException {
-//        Map<String, Object> map = null;
-//        try {
-//            String path = request.getSession().getServletContext().getRealPath("/") + "\\content\\xls\\log.xls";
-//            map = sysLogInfoManager.expSysLogToExcel(logType, beginDay, endDay, path);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            map = new HashMap<String, Object>();
-//            map.put("success", false);
-//            map.put("message", "Excel文件生成失败！");
-//        }
-//        return map;
-//    }
-//}

diff --git a/src/main/java/com/casic/accessControl/feature/domain/Feature.java b/src/main/java/com/casic/accessControl/feature/domain/Feature.java
deleted file mode 100644
index c89a0c2..0000000
--- a/src/main/java/com/casic/accessControl/feature/domain/Feature.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.casic.accessControl.feature.domain;
-
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-
-import javax.persistence.*;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-//点的信息
-@Entity
-@Table(name = "feature")
-public class Feature {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private Long id;
-    @Column(name = "longitude")
-    private Double longitude;
-    @Column(name = "latitude")
-    private Double latitude;
-    @Column(name = "featureName")
-    private String featureName;
-    @Column(name = "type")
-    private int type;
-    @Column(name = "isValid")
-    private Integer isValid;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "parent")
-    private Feature parent;
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "parent")
-    private List<Feature> children;
-    @Column(name = "memo")
-    private String memo;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "owner", referencedColumnName = "id")
-    private User owner;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "company", referencedColumnName = "id")
-    private Company company;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer isValid() {
-        return isValid;
-    }
-
-    public void setValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public Feature getParent() {
-        return parent;
-    }
-
-    public void setParent(Feature parent) {
-        this.parent = parent;
-    }
-
-    public List<Feature> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<Feature> children) {
-        this.children = children;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public User getOwner() {
-        return owner;
-    }
-
-    public void setOwner(User owner) {
-        this.owner = owner;
-    }
-
-    public Company getCompany() {
-        return company;
-    }
-
-    public void setCompany(Company company) {
-        this.company = company;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java b/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
deleted file mode 100644
index 256f261..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import com.casic.accessControl.feature.domain.Feature;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/17.
- */
-public class FeatureDto {
-    private Long id;
-    private Double longitude;
-    private Double latitude;
-    private String featureName;
-    private int type;
-    private Integer isValid;
-    private String memo;
-    private Long parentId;
-
-    private String btnEdit = "<a href='#' class='btn mini blue'><i class='icon-edit'></i>编辑</a>";
-    private String btnDelete = "<a href='#' class='btn mini red'><i class='icon-trash'></i>删除</a>";
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer getIsValid() {
-        return isValid;
-    }
-
-    public void setIsValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public Long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getBtnEdit() {
-        return btnEdit;
-    }
-
-    public void setBtnEdit(String btnEdit) {
-        this.btnEdit = btnEdit;
-    }
-
-    public String getBtnDelete() {
-        return btnDelete;
-    }
-
-    public void setBtnDelete(String btnDelete) {
-        this.btnDelete = btnDelete;
-    }
-
-    public static FeatureDto convert2FeatureDto(Feature feature) {
-        if (feature == null) {
-            return null;
-        }
-        FeatureDto featureDto = new FeatureDto();
-        featureDto.setId(feature.getId());
-        featureDto.setFeatureName(feature.getFeatureName());
-        featureDto.setIsValid(feature.isValid());
-        featureDto.setLatitude(feature.getLatitude());
-        featureDto.setLongitude(feature.getLongitude());
-        featureDto.setMemo(feature.getMemo());
-        featureDto.setType(feature.getType());
-        if (feature.getParent() != null)
-            featureDto.setParentId(feature.getParent().getId());
-        return featureDto;
-    }
-
-    public static List<FeatureDto> convert2FeatureDtos(List<Feature> features) {
-        List<FeatureDto> featureDtos = new ArrayList<FeatureDto>();
-        for (Feature feature : features) {
-            featureDtos.add(convert2FeatureDto(feature));
-        }
-        return featureDtos;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java b/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
deleted file mode 100644
index 785dcba..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/19.
- */
-public class OrgDto {
-    private long id;
-
-    private String name;
-
-    private long parentId;
-
-    private List<OrgDto> children = new ArrayList<OrgDto>();
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(long parentId) {
-        this.parentId = parentId;
-    }
-
-    public List<OrgDto> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<OrgDto> children) {
-        this.children = children;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java b/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
deleted file mode 100644
index a475e21..0000000
--- a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
+++ /dev/null
@@ -1,316 +0,0 @@
-package com.casic.accessControl.feature.manager;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.core.page.Page;
-import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.marker.manager.MarkerManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.DataTableParameter;
-import com.casic.accessControl.util.DataTableUtils;
-import org.apache.commons.collections.CollectionUtils;
-import org.hibernate.Criteria;
-import org.hibernate.Query;
-import org.hibernate.criterion.Restrictions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.jdbc.object.SqlQuery;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-@Service
-public class FeatureManager extends HibernateEntityDao<Feature> {
-
-    private Logger logger = LoggerFactory.getLogger(this.getClass());
-    @Resource
-    private MarkerManager markerManager;
-
-
-    public Feature getFeatureById(Long id) {
-        Feature feature = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("id", id)).add(Restrictions.eq("isValid", 1));
-            feature = (Feature) criteria.list().get(0);
-        } catch (Exception e) {
-            return null;
-        }
-        return feature;
-    }
-
-    public FeatureDto getFeatureDtoById(Long id) {
-        return FeatureDto.convert2FeatureDto(getFeatureById(id));
-    }
-
-    /**
-     * 根据id，软删除某个点或线或片
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param ids 多个id
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public String invalidFeature(String ids) {
-        if (StringUtils.isBlank(ids) || ids.indexOf(")") != -1) {//未传入值，直接返回，防止无效查询,过滤非法请求，防止sql注入
-            return "";
-        }
-        String[] idsArr = ids.split(",");
-        StringBuilder canDeleteIds = new StringBuilder("");
-        StringBuilder cantDeleleIds = new StringBuilder("");
-        //找出能删除的和不能删除的id组合
-        for (String id : idsArr) {
-            Long longId = Long.valueOf(id);
-            if (this.isCanDelete(longId)) {
-                if (canDeleteIds.length() > 0) {
-                    canDeleteIds.append(",");
-                }
-                canDeleteIds.append(id);
-
-            } else {
-                if (cantDeleleIds.length() > 0) {
-                    cantDeleleIds.append(",");
-                }
-                cantDeleleIds.append(id);
-            }
-        }
-
-        String temp1Ids = canDeleteIds.toString();
-        String temp2Ids = cantDeleleIds.toString();
-        if (StringUtils.isNotBlank(temp2Ids)) {//有不能删除的，都不删除
-            return "";
-        }
-        Query query = this.getSession().createQuery("update Feature f set f.isValid = 0 where id in (" + temp1Ids + ")");
-        query.executeUpdate();
-
-        return "success";
-    }
-
-    /**
-     * 判断feature是否可以删除
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param id
-     * @return
-     */
-    private boolean isCanDelete(Long id) {
-        Feature feature = this.getFeatureById(id);
-        if (feature.getParent() == null) {//所有用户共用的根节点不能删除
-            return false;
-        }
-        if (CollectionUtils.isNotEmpty(feature.getChildren())) {
-            for (Feature child : feature.getChildren()) {
-                if (child.isValid() == 1) {
-                    return false;
-                }
-            }
-
-        }
-        List<Marker> markers = markerManager.getMarkerByFeature(feature);
-        if (CollectionUtils.isNotEmpty(markers)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * 将数据库中的feature信息按照参数更新
-     *
-     * @param feature
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public void saveOrupdateFeature(Feature feature, User user) {
-        this.getSession().saveOrUpdate(feature);
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param user 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByUser")
-    public List<FeatureDto> getFeaturesByUser(Integer type, User user) {
-        if (user == null) {
-            return Collections.emptyList();
-        }
-        Company company = user.getCompany();
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("type", type));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-        return FeatureDto.convert2FeatureDtos(features);
-    }
-
-    /**
-     * 分页使用，datatable获取相应type的feature某页数据
-     *
-     * @param params
-     * @param user
-     * @return
-     */
-    public DataTable<FeatureDto> getPageFeatureListByTye(String params, Feature parent, User user) {
-        DataTable<FeatureDto> result = new DataTable<FeatureDto>();
-        DataTableParameter parameter = DataTableUtils.getDataTableParameterByJsonParam(params);
-        int start = parameter.getiDisplayStart();
-        int pageSize = parameter.getiDisplayLength();
-        int pageNo = (start / pageSize) + 1;
-        Criteria criteria = this.createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        Company company = user.getCompany();
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("isValid", 1)).add(Restrictions.eq("parent", parent));
-        Page page = pagedQuery(criteria, pageNo, pageSize);
-        List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos((List<Feature>) page.getResult());
-        result.setAaData(featureDtos);
-        result.setiTotalDisplayRecords((int) page.getTotalCount());
-        result.setiTotalRecords((int) page.getTotalCount());
-        result.setsEcho(parameter.getsEcho());
-        return result;
-
-
-    }
-
-    /**
-     * 获取层次结构列表,增加缓存
-     *
-     * @param type
-     * @param company
-     * @return
-     */
-    @Cacheable(value = "getOrgList")
-    public String getOrgList(Integer type, Company company) {
-        List<OrgDto> orgDtos = new ArrayList<OrgDto>();
-        List<Feature> features = this.getRootFeatures(type);
-        for (Feature feature : features) {
-            orgDtos.add(this.getChildrenByParentId(feature.getId(), company));
-        }
-        String jsonStr = null;
-        try {
-            jsonStr = new JsonMapper().toJson(orgDtos);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return jsonStr;
-    }
-
-    //    @Cacheable(value = "getChildrenByParentId", key = "#id")
-    public OrgDto getChildrenByParentId(Long id, Company company) {
-        if (id == null) {
-            return null;
-        }
-        Feature feature = getFeatureById(id);
-        if (feature == null) {
-            return null;
-        }
-        //创建OrgDto节点
-        OrgDto orgDto = new OrgDto();
-        orgDto.setId(id); //保存ID信息
-        orgDto.setName(feature.getFeatureName());
-        if (feature.getParent() != null) {
-            orgDto.setParentId(feature.getParent().getId());
-        }
-        List<Feature> departments = this.getActiveChildrenOrgs(feature, company);
-        for (Feature fea : departments) {
-            orgDto.getChildren().add(this.getChildrenByParentId(fea.getId(), company));
-        }
-        return orgDto;
-    }
-
-    //    @Cacheable(value = "getActiveChildrenOrgs", key = "#department.getId()")
-    private List<Feature> getActiveChildrenOrgs(Feature department, Company company) {
-        List<Feature> features = new ArrayList<Feature>();
-        for (Feature feature : department.getChildren()) {
-            if (feature.isValid() == 1 && feature.getCompany().getId().equals(company.getId())) {
-                features.add(feature);
-            }
-        }
-        return features;
-    }
-
-
-    public List<Feature> getRootFeatures(Integer type) {
-        List<Feature> features = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("type", type)).add(Restrictions.isNull("parent"));
-            features = criteria.list();
-        } catch (Exception e) {
-            return Collections.emptyList();
-        }
-        return features;
-
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param company 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByCompany", key = "#company.getId()")
-    public List<Feature> getFeaturesByCompany(Company company) {
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-        criteria.add(Restrictions.eq("company", company));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-
-        for (Feature f : features) {
-            f.getChildren().toString();
-            f.getOwner().toString();
-            if (f.getParent() != null)
-                f.getParent().toString();
-        }
-        return features;
-    }
-
-    /**
-     * 根据组织结构的id获取叶子节点
-     ***重要：**已更改为包含本节点****
-     * @param type
-     * @param feature
-     * @return
-     */
-    public List<Feature> getLeafByParentId(Integer type, Feature feature) {
-        if (feature == null || feature.isValid() == 0) return Collections.emptyList();
-        List<Feature> features = new ArrayList<Feature>();
-        if (CollectionUtils.isEmpty(feature.getChildren())) {
-            features.add(feature);
-            return features;
-        }
-        List<Feature> children = feature.getChildren();
-        boolean flag = false;
-        for (Feature child : children) {
-            if (child.isValid() == 1) {
-                flag = true;
-                features.addAll(getLeafByParentId(type, child));
-            }
-        }
-//        if (!flag) {//没有有效的子节点
-            features.add(feature);
-//        }
-        return features;
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java b/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
deleted file mode 100644
index a706a36..0000000
--- a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package com.casic.accessControl.feature.web;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.Role;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.CompanyManager;
-import com.casic.accessControl.user.manager.UserManager;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.StringUtils;
-import com.casic.accessControl.xls.Common;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import sun.org.mozilla.javascript.internal.EcmaError;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.IOException;
-import java.util.*;
-
-/**
- * 提供http访问接口
- * Created by lenovo on 2016/5/16.
- */
-@Controller
-@RequestMapping(value = "feature")
-public class FeatureController {
-    @Autowired
-    private FeatureManager featureManager;
-    @Autowired
-    private UserManager userManager;
-    @Autowired
-    private CompanyManager companyManager;
-
-    @RequestMapping(value = "org-list")
-    @ResponseBody
-    public String getOrgList(@RequestParam(required = true) Integer type, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Company company = user.getCompany();
-        return featureManager.getOrgList(type, company);
-    }
-
-    @RequestMapping(value = "org-list-na")
-    @ResponseBody
-    public Map<String, String> getOrgListNa(@RequestParam Long userId) {//na端所有传过来的userid都是公司id
-        Map<String, String> res = new HashMap<String, String>();
-        res.put("message", "列表获取失败");
-        try {
-//            User user = userManager.getUserById(userId);//获取当前登录用户
-//            Company company = user.getCompany();
-            Company company = companyManager.getCompanyById(userId);
-            String areas = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.AREA.getIndex(), company);
-            String lines = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.LINE.getIndex(), company);
-            res.put("feature", areas);
-            res.put("line", lines);
-        } catch (Exception e) {
-            return res;
-        }
-        res.put("message", "成功获取");
-        return res;
-    }
-
-    @RequestMapping(value = "getFeature")
-    @ResponseBody
-    public Map<String, Object> getFeaturesByUser(@RequestParam(required = true) Integer type, HttpSession session) {
-
-        Map<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        List<FeatureDto> list = featureManager.getFeaturesByUser(type, user);
-        if (list == null) {//获取列表失败
-            result.put("message", "获取列表出现错误");
-            return result;
-        } else {
-            result.put("data", list);
-            result.put("message", "获取列表成功");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "getSubFeatureList")
-    public void getSubFeatureList(@RequestParam(required = true) String jsonParams, @RequestParam(required = false) Long parentId, HttpServletResponse response, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Feature parent = featureManager.getFeatureById(parentId);
-        DataTable<FeatureDto> dtoDataTable = featureManager.getPageFeatureListByTye(jsonParams, parent, user);
-        Gson gson = new Gson();
-        String json = gson.toJson(dtoDataTable);
-        response.setCharacterEncoding("utf-8");
-        try {
-            response.getWriter().write(json);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @RequestMapping(value = "delete")
-    @ResponseBody
-    public Map<String, Object> deleteFeatureById(@RequestParam(required = true) Long id, HttpSession session) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        try {
-            String res = featureManager.invalidFeature(id.toString());
-            if (StringUtils.isBlank(res)) {
-                result.put("message", "删除失败");
-            } else {
-                result.put("message", "删除成功");
-                result.put("success", true);
-            }
-        } catch (Exception e) {
-            result.put("message", "删除失败");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "save")
-    @ResponseBody
-    public Map<String, Object> save(@RequestParam(required = true) String params, HttpSession session) {
-        Gson gson = new Gson();
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        Map markers = gson.fromJson(params, HashMap.class);
-        String featureName = (String) markers.get("featureName");
-        String memo = (String) markers.get("memo") == null ? "" : (String) markers.get("memo");
-        Long parentId = Long.valueOf(StringUtils.isBlank((String) markers.get("parentId")) ? "-1" : (String) markers.get("parentId"));//不知为什么转过来为Double
-        Long id = Long.valueOf(StringUtils.isBlank((String) markers.get("id")) ? "-1" : (String) markers.get("id"));
-
-
-        if (StringUtils.isBlank(featureName) || parentId.equals(-1L)) {
-            result.put("message", "必要参数未传送");
-            return result;
-        }
-        Feature feature = new Feature();
-        feature.setValid(1);
-        Feature parent = featureManager.getFeatureById(parentId);
-        feature.setParent(parent);
-        feature.setFeatureName(featureName);
-        feature.setMemo(memo);
-        feature.setOwner(user);
-        feature.setCompany(user.getCompany());
-        feature.setType(parent.getType());
-        if (!id.equals(-1L)) {
-            feature.setId(id);
-        }
-        try {
-            featureManager.saveOrupdateFeature(feature, user);
-            result.put("message", "保存成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "保存失败");
-        }
-        return result;
-
-    }
-
-
-    @RequestMapping(value = "getFeatureById")
-    @ResponseBody
-    public Map<String, Object> getFeatureById(@RequestParam(required = true) Long id) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        try {
-            FeatureDto feature = featureManager.getFeatureDtoById(id);
-            result.put("data", feature);
-            result.put("message", "获取成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "获取失败");
-        }
-        return result;
-
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
index 08a290e..3f53635 100644
--- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
+++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
@@ -1,6 +1,6 @@
 package com.casic.accessControl.marker.dto;
 
-import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.domain.Feature;
 import com.casic.accessControl.marker.domain.Marker;
 import org.apache.commons.collections.CollectionUtils;
 
diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
index 080b291..7fe7434 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -4,8 +4,6 @@
 import com.casic.accessControl.core.hibernate.HibernateEntityDao;
 import com.casic.accessControl.core.page.Page;
 import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.user.domain.Company;
@@ -49,9 +47,6 @@
 public class MarkerManager extends HibernateEntityDao<Marker> {
 
     @Resource
-    private FeatureManager featureManager;
-
-    @Resource
     private UserManager userInfoManager;
 
 
@@ -154,33 +149,33 @@
 
     //获取marker
 //    @Cacheable(value = "getMarkerByFeature", key = "#feature.getId()")
-    public List<Marker> getMarkerByFeature(Feature feature) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            criteria.add(Restrictions.eq("belongLine", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            criteria.add(Restrictions.eq("belongLine", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
-    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
-            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
+//            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
     public boolean saveMarker(Marker marker) {
         try {
@@ -465,7 +460,7 @@
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setLayStyle(sheet.getCell(indexMap.get("layStyle"), i).getContents());
-                } else if(recordTypeFlag == 4) {
+                } else if (recordTypeFlag == 4) {
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setBelowType(sheet.getCell(indexMap.get("belowType"), i).getContents());
diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
index a19f2f5..7675e1f 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -2,9 +2,6 @@
 
 import com.casic.accessControl.core.ext.export.CsvExportor;
 import com.casic.accessControl.core.ext.export.TableModel;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.manager.MarkerManager;
diff --git a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java b/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
deleted file mode 100644
index e69de29..0000000
--- a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
+++ /dev/null
diff --git a/src/main/java/com/casic/accessControl/rs/FeatureResource.java b/src/main/java/com/casic/accessControl/rs/FeatureResource.java
index 68aeb97..e97f18b 100644
--- a/src/main/java/com/casic/accessControl/rs/FeatureResource.java
+++ b/src/main/java/com/casic/accessControl/rs/FeatureResource.java
@@ -1,65 +1,65 @@
-package com.casic.accessControl.rs;
-
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.UserManager;
-import com.google.gson.Gson;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import javax.annotation.Resource;
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
-* Created by admin on 2015/1/15.
-*/
-@Component
-@Path("feature")
-public class FeatureResource
-{
-    private static Logger logger = LoggerFactory.getLogger(FeatureResource.class);
-
-    @Resource
-    private UserManager userManager;
-
-    @Resource
-    private FeatureManager featureManager;
-
-    @GET
-    @Path("get")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map get(@QueryParam("userName") String userName ){
-        Map map = new HashMap<String, Object>();
-        try {
-            User user = userManager.getUserByName(userName);
-            if (user == null) {
-                map.put("success", "false");
-                map.put("message", "人员不存在！");
-                return map;
-            }
-            Company company = user.getCompany();
-            if (company!=null)
-            {
-                List<Feature> features = featureManager.getFeaturesByCompany(company);
-                List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos(features);
-                map.put("success", "true");
-                map.put("message", featureDtos);
-            }
-        }
-        catch (Exception e)
-        {
-            map.put("success", "false");
-            map.put("message", e.getMessage());
-        }
-        return  map;
-    }
-}
+//package com.casic.accessControl.rs;
+//
+//import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.dto.FeatureDto;
+//import com.casic.accessControl.feature.manager.FeatureManager;
+//import com.casic.accessControl.user.domain.Company;
+//import com.casic.accessControl.user.domain.User;
+//import com.casic.accessControl.user.manager.UserManager;
+//import com.google.gson.Gson;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.stereotype.Component;
+//import org.springframework.web.bind.annotation.RequestParam;
+//
+//import javax.annotation.Resource;
+//import javax.ws.rs.*;
+//import javax.ws.rs.core.MediaType;
+//import java.util.HashMap;
+//import java.util.List;
+//import java.util.Map;
+//
+///**
+//* Created by admin on 2015/1/15.
+//*/
+//@Component
+//@Path("feature")
+//public class FeatureResource
+//{
+//    private static Logger logger = LoggerFactory.getLogger(FeatureResource.class);
+//
+//    @Resource
+//    private UserManager userManager;
+//
+//    @Resource
+//    private FeatureManager featureManager;
+//
+//    @GET
+//    @Path("get")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public Map get(@QueryParam("userName") String userName ){
+//        Map map = new HashMap<String, Object>();
+//        try {
+//            User user = userManager.getUserByName(userName);
+//            if (user == null) {
+//                map.put("success", "false");
+//                map.put("message", "人员不存在！");
+//                return map;
+//            }
+//            Company company = user.getCompany();
+//            if (company!=null)
+//            {
+//                List<Feature> features = featureManager.getFeaturesByCompany(company);
+//                List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos(features);
+//                map.put("success", "true");
+//                map.put("message", featureDtos);
+//            }
+//        }
+//        catch (Exception e)
+//        {
+//            map.put("success", "false");
+//            map.put("message", e.getMessage());
+//        }
+//        return  map;
+//    }
+//}
diff --git a/src/main/java/com/casic/accessControl/rs/MapInfo.java b/src/main/java/com/casic/accessControl/rs/MapInfo.java
deleted file mode 100644
index a77fce9..0000000
--- a/src/main/java/com/casic/accessControl/rs/MapInfo.java
+++ /dev/null
@@ -1,131 +0,0 @@
-//package com.casic.accessControl.rs;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-///**
-// * Created by admin on 2015/8/26.
-// */
-//public class MapInfo {
-//
-//    private String mapUrl;
-//
-//    private String updateTime;
-//
-//    private String uploader;
-//
-//    private String name;
-//
-//    private String uuid;
-//
-//    private String site;
-//    /*
-//    0:草稿
-//    1：待审核
-//    2：通过
-//    3: 驳回
-//     */
-//    private String status;
-//
-//    //
-//    private int id;
-//
-//
-//    public String getMapUrl()
-//    {
-//        return mapUrl;
-//    }
-//
-//    public void setMapUrl(String mapUrl)
-//    {
-//        this.mapUrl = mapUrl;
-//    }
-//
-//    public String getUpdateTime()
-//    {
-//        return updateTime;
-//    }
-//
-//    public void setUpdateTime(String updateTime)
-//    {
-//        this.updateTime = updateTime;
-//    }
-//
-//    public String getUploader()
-//    {
-//        return uploader;
-//    }
-//
-//    public void setUploader(String uploader)
-//    {
-//        this.uploader = uploader;
-//    }
-//
-//    public String getName()
-//    {
-//        return name;
-//    }
-//
-//    public void setName(String name)
-//    {
-//        this.name = name;
-//    }
-//
-//    public String getUuid()
-//    {
-//        return uuid;
-//    }
-//
-//    public void setUuid(String uuid)
-//    {
-//        this.uuid = uuid;
-//    }
-//
-//    public String getSite()
-//    {
-//        return site;
-//    }
-//
-//    public void setSite(String site)
-//    {
-//        this.site = site;
-//    }
-//
-//    public String getStatus()
-//    {
-//        return status;
-//    }
-//
-//    public void setStatus(String status)
-//    {
-//        this.status = status;
-//    }
-//
-//    public int getId()
-//    {
-//        return id;
-//    }
-//
-//    public void setId(int id)
-//    {
-//        this.id = id;
-//    }
-//
-//    public static List<MapInfo> getMockerMaps()
-//    {
-//        List<MapInfo> maps = new ArrayList<MapInfo>();
-//        for (int i = 0; i < 20; i++)
-//        {
-//            MapInfo map = new MapInfo();
-//            map.setId(i);
-//            map.setUploader("张帆");
-//            map.setMapUrl("http://192.168.0.111:9080/accessControl/logo.jpg");
-//            map.setSite("永旺路"+i);
-//            map.setUpdateTime("2015-08-02");
-//            map.setStatus("待审核");
-//            maps.add(map);
-//        }
-//        return maps;
-//
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/rs/MarkResource.java b/src/main/java/com/casic/accessControl/rs/MarkResource.java
index 8ae4d85..cef1580 100644
--- a/src/main/java/com/casic/accessControl/rs/MarkResource.java
+++ b/src/main/java/com/casic/accessControl/rs/MarkResource.java
@@ -1,7 +1,7 @@
 package com.casic.accessControl.rs;
 
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
+//import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.manager.MarkerManager;
 import com.casic.accessControl.user.domain.Company;
@@ -35,8 +35,8 @@
     @Resource
     private MarkerManager markerManager;
 
-    @Resource
-    private FeatureManager featureManager;
+//    @Resource
+//    private FeatureManager featureManager;
 
     @GET
     @Path("post")
diff --git a/src/main/java/com/casic/accessControl/rs/UserObj.java b/src/main/java/com/casic/accessControl/rs/UserObj.java
deleted file mode 100644
index c0fe651..0000000
--- a/src/main/java/com/casic/accessControl/rs/UserObj.java
+++ /dev/null
@@ -1,61 +0,0 @@
-//package com.casic.accessControl.rs;
-//
-//import java.io.Serializable;
-//
-///**
-// * Created by admin on 2015/10/9.
-// */
-//public class UserObj implements Serializable {
-//    private String userName;
-//    private String password;
-//    private String appId;
-//    /*
-//    roles:��ɫ֮���Զ��ŷָ�
-//     */
-//    private String roles;
-//
-//    /*
-//    authorities:Ȩ��֮���Զ��ŷָ�
-//    */
-//    private String authorities;
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public String getPassword() {
-//        return password;
-//    }
-//
-//    public void setPassword(String password) {
-//        this.password = password;
-//    }
-//
-//    public String getAppId() {
-//        return appId;
-//    }
-//
-//    public void setAppId(String appId) {
-//        this.appId = appId;
-//    }
-//
-//    public String getRoles() {
-//        return roles;
-//    }
-//
-//    public void setRoles(String roles) {
-//        this.roles = roles;
-//    }
-//
-//    public String getAuthorities() {
-//        return authorities;
-//    }
-//
-//    public void setAuthorities(String authorities) {
-//        this.authorities = authorities;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java b/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java
deleted file mode 100644
index ac60ed5..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java
+++ /dev/null
@@ -1,65 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//import org.geotools.referencing.operation.transform.NADCONTransform;
-//
-//import javax.persistence.*;
-//
-///**
-// * Created by test203 on 2015/10/29.
-// */
-//@Entity
-//@Table(name = "ZX_DATABASE_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_DATABASE_INFO_ID", sequenceName = "SEQ_ZX_DATABASE_INFO_ID", allocationSize = 1, initialValue = 1)
-//public class DataBaseInfo {
-//    private Long id;
-//    private String account;
-//    private String password;
-//    private String sid;
-//    private String owner;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_ZX_DATABASE_INFO_ID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "ACCOUNT", nullable = false)
-//    public String getAccount() {
-//        return account;
-//    }
-//
-//    public void setAccount(String account) {
-//        this.account = account;
-//    }
-//
-//    @Column(name = "PASSWORD", nullable = false)
-//    public String getPassword() {
-//        return password;
-//    }
-//
-//    public void setPassword(String password) {
-//        this.password = password;
-//    }
-//
-//    @Column(name = "SID", nullable = false)
-//    public String getSid() {
-//        return sid;
-//    }
-//
-//    public void setSid(String sid) {
-//        this.sid = sid;
-//    }
-//
-//    @Column(name = "OWNER", nullable = false)
-//    public String getOwner() {
-//        return owner;
-//    }
-//
-//    public void setOwner(String owner) {
-//        this.owner = owner;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java b/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java
deleted file mode 100644
index 9578060..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java
+++ /dev/null
@@ -1,77 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//import com.casic.accessControl.org.domain.UserInfo;
-//
-//import javax.persistence.*;
-//import java.util.Date;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Entity
-//@Table(name = "ZX_ORCL_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_ORCL_INFO_ID",sequenceName = "SEQ_ZX_ORCL_INFO_ID",allocationSize = 1,initialValue = 1)
-//public class OrclInfo {
-//    private Long id;
-//    private String fileName;
-//    private String filePath;
-//    private String memo;
-//    private Date bkDay = new Date();
-//    private UserInfo userInfo;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE,generator = "SEQ_ZX_ORCL_INFO_ID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "FILE_NAME",nullable = false)
-//    public String getFileName() {
-//        return fileName;
-//    }
-//
-//    public void setFileName(String fileName) {
-//        this.fileName = fileName;
-//    }
-//
-//    @Column(name = "FILE_PATH",nullable = false)
-//    public String getFilePath() {
-//        return filePath;
-//    }
-//
-//    public void setFilePath(String filePath) {
-//        this.filePath = filePath;
-//    }
-//
-//    @Column(name = "MEMO")
-//    public String getMemo() {
-//        return memo;
-//    }
-//
-//    public void setMemo(String memo) {
-//        this.memo = memo;
-//    }
-//
-//    @Column(name = "BK_DAY")
-//    public Date getBkDay() {
-//        return bkDay;
-//    }
-//
-//    public void setBkDay(Date bkDay) {
-//        this.bkDay = bkDay;
-//    }
-//
-//    @ManyToOne(fetch = FetchType.LAZY)
-//    @JoinColumn(name = "USER_ID")
-//    public UserInfo getUserInfo() {
-//        return userInfo;
-//    }
-//
-//    public void setUserInfo(UserInfo userInfo) {
-//        this.userInfo = userInfo;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/SysLogInfo.java b/src/main/java/com/casic/accessControl/sys/domain/SysLogInfo.java
deleted file mode 100644
index 60e5583..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/SysLogInfo.java
+++ /dev/null
@@ -1,70 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//
-//import com.casic.accessControl.user.domain.UserInfo;
-//
-//import javax.persistence.*;
-//import java.io.Serializable;
-//import java.util.Date;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Entity
-//@Table(name = "ZX_SYS_LOG_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_SYS_LOG_ID",sequenceName = "SEQ_ZX_SYS_LOG_ID",allocationSize = 1,initialValue = 1)
-//public class SysLogInfo implements Serializable{
-//    private Long id;
-//    private String logType;//系统日志、运行日志、操作日志
-//    private String msg;
-//    private Date logDay = new Date();
-//    private UserInfo user;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE,generator = "SEQ_ZX_SYS_LOG_ID")
-//    @Column(name = "DBID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "LOG_TYPE",nullable = false)
-//    public String getLogType() {
-//        return logType;
-//    }
-//
-//    public void setLogType(String logType) {
-//        this.logType = logType;
-//    }
-//
-//    @Column(name = "LOG_MSG",nullable = false)
-//    public String getMsg() {
-//        return msg;
-//    }
-//
-//    public void setMsg(String msg) {
-//        this.msg = msg;
-//    }
-//
-//    @Column(name = "LOG_DAY")
-//    public Date getLogDay() {
-//        return logDay;
-//    }
-//
-//    public void setLogDay(Date logDay) {
-//        this.logDay = logDay;
-//    }
-//
-//    @ManyToOne(fetch = FetchType.LAZY)
-//    @JoinColumn(name = "USER_ID")
-//    public UserInfo getUser() {
-//        return user;
-//    }
-//
-//    public void setUser(UserInfo user) {
-//        this.user = user;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/dto/ExcelInfoDTO.java b/src/main/java/com/casic/accessControl/sys/dto/ExcelInfoDTO.java
deleted file mode 100644
index 2fe496e..0000000
--- a/src/main/java/com/casic/accessControl/sys/dto/ExcelInfoDTO.java
+++ /dev/null
@@ -1,77 +0,0 @@
-//package com.casic.accessControl.sys.dto;
-//
-//import com.casic.accessControl.sys.domain.SysLogInfo;
-//import com.casic.accessControl.util.DateUtils;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-///**
-// * Created by test203 on 2015/10/23.
-// */
-//public class ExcelInfoDTO {
-//    private String logType;//系统日志、运行日志、操作日志
-//    private String msg;
-//    private String logDay;
-//    private String userName;
-//
-//    public String getLogType() {
-//        return logType;
-//    }
-//
-//    public void setLogType(String logType) {
-//        this.logType = logType;
-//    }
-//
-//    public String getMsg() {
-//        return msg;
-//    }
-//
-//    public void setMsg(String msg) {
-//        this.msg = msg;
-//    }
-//
-//    public String getLogDay() {
-//        return logDay;
-//    }
-//
-//    public void setLogDay(String logDay) {
-//        this.logDay = logDay;
-//    }
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public static ExcelInfoDTO ConvertToDTO(SysLogInfo logInfo){
-//        if(null!=logInfo){
-//            ExcelInfoDTO dto = new ExcelInfoDTO();
-//            dto.setLogType(logInfo.getLogType());
-//            if(null!=logInfo.getLogDay()){
-//                dto.setLogDay(DateUtils.sdf2.format(logInfo.getLogDay()));
-//            }else {
-//                dto.setLogDay(" ");
-//            }
-//            dto.setMsg(logInfo.getMsg());
-//            if(null!=logInfo.getUser()){
-//                dto.setUserName(logInfo.getUser().getUserName());
-//            }else {
-//                dto.setUserName(" ");
-//            }
-//            return dto;
-//        }
-//        return new ExcelInfoDTO();
-//    }
-//
-//    public static List<ExcelInfoDTO> ConvertToDTO(List<SysLogInfo> list){
-//        List<ExcelInfoDTO> dtoList = new ArrayList<ExcelInfoDTO>();
-//        for(SysLogInfo log : list){
-//            dtoList.add(ConvertToDTO(log));
-//        }
-//        return dtoList;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/dto/OrclInfoDTO.java b/src/main/java/com/casic/accessControl/sys/dto/OrclInfoDTO.java
deleted file mode 100644
index 46a261d..0000000
--- a/src/main/java/com/casic/accessControl/sys/dto/OrclInfoDTO.java
+++ /dev/null
@@ -1,124 +0,0 @@
-//package com.casic.accessControl.sys.dto;
-//
-//import com.casic.accessControl.org.domain.UserInfo;
-//import com.casic.accessControl.shp.domain.LayerInfo;
-//import com.casic.accessControl.sys.domain.OrclInfo;
-//import com.casic.accessControl.util.DateUtils;
-//
-//import java.util.ArrayList;
-//import java.util.Date;
-//import java.util.List;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//public class OrclInfoDTO {
-//    private Long id;
-//    private String fileName;
-//    private String filePath;
-//    private String memo;
-//    private String bkDay;
-//    private Long userId;
-//    private String userName;
-//    private String btnRestor = "<a href='#' class='btn mini blue'>还原</a>";
-//    private String btnDelete = "<a href='#' class='btn mini red'>删除</a>";
-//
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    public String getFileName() {
-//        return fileName;
-//    }
-//
-//    public void setFileName(String fileName) {
-//        this.fileName = fileName;
-//    }
-//
-//    public String getFilePath() {
-//        return filePath;
-//    }
-//
-//    public void setFilePath(String filePath) {
-//        this.filePath = filePath;
-//    }
-//
-//    public String getMemo() {
-//        return memo;
-//    }
-//
-//    public void setMemo(String memo) {
-//        this.memo = memo;
-//    }
-//
-//    public String getBkDay() {
-//        return bkDay;
-//    }
-//
-//    public void setBkDay(String bkDay) {
-//        this.bkDay = bkDay;
-//    }
-//
-//    public Long getUserId() {
-//        return userId;
-//    }
-//
-//    public void setUserId(Long userId) {
-//        this.userId = userId;
-//    }
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public String getBtnRestor() {
-//        return btnRestor;
-//    }
-//
-//    public void setBtnRestor(String btnRestor) {
-//        this.btnRestor = btnRestor;
-//    }
-//
-//    public String getBtnDelete() {
-//        return btnDelete;
-//    }
-//
-//    public void setBtnDelete(String btnDelete) {
-//        this.btnDelete = btnDelete;
-//    }
-//
-//    public static OrclInfoDTO ConvertToDTO(OrclInfo orcl){
-//        if(null!=orcl){
-//            OrclInfoDTO dto = new OrclInfoDTO();
-//            dto.setId(orcl.getId());
-//            dto.setFileName(orcl.getFileName());
-//            dto.setFilePath(orcl.getFilePath());
-//            dto.setMemo(orcl.getMemo());
-//            if(null!=orcl.getBkDay()){
-//                dto.setBkDay(DateUtils.sdf1.format(orcl.getBkDay()));
-//            }
-//            if(null!=orcl.getUserInfo()){
-//                dto.setUserId(orcl.getUserInfo().getId());
-//                dto.setUserName(orcl.getUserInfo().getUsername());
-//            }
-//            return dto;
-//        }
-//        return new OrclInfoDTO();
-//    }
-//
-//    public static List<OrclInfoDTO> ConvertToDTO(List<OrclInfo> list){
-//        List<OrclInfoDTO> dtoList = new ArrayList<OrclInfoDTO>();
-//        for(OrclInfo orcl : list){
-//            dtoList.add(ConvertToDTO(orcl));
-//        }
-//        return dtoList;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/dto/SysLogInfoDTO.java b/src/main/java/com/casic/accessControl/sys/dto/SysLogInfoDTO.java
deleted file mode 100644
index 64d6c39..0000000
--- a/src/main/java/com/casic/accessControl/sys/dto/SysLogInfoDTO.java
+++ /dev/null
@@ -1,103 +0,0 @@
-//package com.casic.accessControl.sys.dto;
-//
-//import com.casic.accessControl.sys.domain.SysLogInfo;
-//import com.casic.accessControl.util.DateUtils;
-//
-//import java.util.ArrayList;
-//import java.util.Date;
-//import java.util.List;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//public class SysLogInfoDTO {
-//    private Long id;
-//    private String logType;//系统日志、运行日志、操作日志
-//    private String msg;
-//    private String logDay;
-//    private Long userId;
-//    private String userName;
-//    private String btn = "<a href='#' class='btn mini blue'>查看</a>";
-//
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    public String getLogType() {
-//        return logType;
-//    }
-//
-//    public void setLogType(String logType) {
-//        this.logType = logType;
-//    }
-//
-//    public String getMsg() {
-//        return msg;
-//    }
-//
-//    public void setMsg(String msg) {
-//        this.msg = msg;
-//    }
-//
-//    public String getLogDay() {
-//        return logDay;
-//    }
-//
-//    public void setLogDay(String logDay) {
-//        this.logDay = logDay;
-//    }
-//
-//    public Long getUserId() {
-//        return userId;
-//    }
-//
-//    public void setUserId(Long userId) {
-//        this.userId = userId;
-//    }
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public String getBtn() {
-//        return btn;
-//    }
-//
-//    public void setBtn(String btn) {
-//        this.btn = btn;
-//    }
-//
-//    public static SysLogInfoDTO ConvertToDTO(SysLogInfo log){
-//        if(null!=log){
-//            SysLogInfoDTO dto = new SysLogInfoDTO();
-//            dto.setId(log.getId());
-//            dto.setLogType(log.getLogType());
-//            if(null!=log.getLogDay()){
-//                dto.setLogDay(DateUtils.sdf2.format(log.getLogDay()));
-//            }
-//            dto.setMsg(log.getMsg());
-//            if(null!=log.getUser()){
-//                dto.setUserId(log.getUser().getId());
-//                dto.setUserName(log.getUser().getUserName());
-//            }
-//            return dto;
-//        }
-//        return new SysLogInfoDTO();
-//    }
-//
-//    public static List<SysLogInfoDTO> ConvertToDTO(List<SysLogInfo> list){
-//        List<SysLogInfoDTO> dtoList = new ArrayList<SysLogInfoDTO>();
-//        for(SysLogInfo log : list){
-//            dtoList.add(ConvertToDTO(log));
-//        }
-//        return dtoList;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/manager/DataBaseInfoManager.java b/src/main/java/com/casic/accessControl/sys/manager/DataBaseInfoManager.java
deleted file mode 100644
index b1395e6..0000000
--- a/src/main/java/com/casic/accessControl/sys/manager/DataBaseInfoManager.java
+++ /dev/null
@@ -1,19 +0,0 @@
-//package com.casic.accessControl.sys.manager;
-//
-//import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-//import com.casic.accessControl.sys.domain.DataBaseInfo;
-//import org.hibernate.Criteria;
-//import org.springframework.stereotype.Service;
-//
-///**
-// * Created by test203 on 2015/10/29.
-// */
-//@Service
-//public class DataBaseInfoManager extends HibernateEntityDao<DataBaseInfo>{
-//    public Criteria getCriteria(){
-//        return  getSession().createCriteria(DataBaseInfo.class);
-//    }
-//    public Object getDataBaseInfo(){
-//        return getCriteria().uniqueResult();
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/manager/OrclInfoManager.java b/src/main/java/com/casic/accessControl/sys/manager/OrclInfoManager.java
deleted file mode 100644
index d9804a1..0000000
--- a/src/main/java/com/casic/accessControl/sys/manager/OrclInfoManager.java
+++ /dev/null
@@ -1,127 +0,0 @@
-//package com.casic.accessControl.sys.manager;
-//
-//import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-//import com.casic.accessControl.core.page.Page;
-//import com.casic.accessControl.sys.domain.DataBaseInfo;
-//import com.casic.accessControl.sys.domain.OrclInfo;
-//import com.casic.accessControl.sys.dto.OrclInfoDTO;
-//import com.casic.accessControl.util.*;
-//import org.hibernate.Criteria;
-//import org.hibernate.criterion.Order;
-//import org.hibernate.criterion.Restrictions;
-//import org.springframework.jdbc.core.JdbcTemplate;
-//import org.springframework.stereotype.Service;
-//
-//import javax.annotation.Resource;
-//import java.io.File;
-//import java.io.IOException;
-//import java.text.ParseException;
-//import java.util.*;
-//
-///**
-//* Created by Administrator on 2015/8/17.
-//*/
-//@Service
-//public class OrclInfoManager extends HibernateEntityDao<OrclInfo> {
-//    @Resource
-//    private DataBaseInfoManager dataBaseInfoManager;
-//
-//    public void setDataBaseInfoManager(DataBaseInfoManager dataBaseInfoManager) {
-//        this.dataBaseInfoManager = dataBaseInfoManager;
-//    }
-//
-//    public Criteria getCriteria() {
-//        return getSession().createCriteria(OrclInfo.class);
-//    }
-//
-//    public DataTable<OrclInfoDTO> pageQueryOrclInfoDTO(String jsonParam, String beginDay, String endDay) throws ParseException {
-//        DataTableParameter dataTableParam = DataTableUtils.getDataTableParameterByJsonParam(jsonParam);
-//
-//        int start = dataTableParam.getiDisplayStart();
-//        int pageSize = dataTableParam.getiDisplayLength();
-//        int pageNo = (start / pageSize) + 1;
-//
-//        Criteria criteria = getCriteria();
-//        criteria.addOrder(Order.desc("id"));
-//
-//        if (StringUtils.isNotBlank(beginDay)) {
-//            criteria.add(Restrictions.ge("bkDay", DateUtils.sdf1.parse(beginDay)));
-//        }
-//        if (StringUtils.isNotBlank(endDay)) {
-//            Date date = DateUtils.sdf1.parse(endDay);
-//            Calendar calendar = Calendar.getInstance();
-//            calendar.setTime(date);
-//            calendar.add(Calendar.DATE, 1);
-//            criteria.add(Restrictions.le("bkDay", calendar.getTime()));
-//        }
-//
-//        Page page = pagedQuery(criteria, pageNo, pageSize);
-//
-//        List<OrclInfoDTO> dtoList = OrclInfoDTO.ConvertToDTO((List<OrclInfo>) page.getResult());
-//        DataTable<OrclInfoDTO> dt = new DataTable<OrclInfoDTO>();
-//        dt.setAaData(dtoList);
-//        dt.setiTotalDisplayRecords((int) page.getTotalCount());
-//        dt.setsEcho(dataTableParam.getsEcho());
-//        dt.setiTotalRecords((int) page.getTotalCount());
-//        return dt;
-//    }
-//
-//    public Map<String, Object> backupDB(String memo, String path) throws IOException, InterruptedException {
-//        Map<String, Object> map = new HashMap<String, Object>();
-//        DataBaseInfo db = (DataBaseInfo) dataBaseInfoManager.getDataBaseInfo();
-//        if (null == db) {
-//            map.put("success", false);
-//            map.put("message", "没有找到数据库配置！");
-//            return map;
-//        }
-//        String fileName = db.getSid() + DateUtils.sdfFile.format(new Date()) + ".dmp";
-//        String filePath = path + "\\" + fileName;
-//
-//        DataBaseUtils.doExp(db.getAccount(), db.getPassword(), db.getSid(), db.getOwner(), filePath);
-//
-//        OrclInfo orcl = new OrclInfo();
-//        orcl.setMemo(memo);
-//        orcl.setFileName(fileName);
-//        orcl.setFilePath(filePath);
-//        save(orcl);
-//
-//        map.put("success", true);
-//        return map;
-//    }
-//
-//    private String dropTables() {
-//        StringBuilder tables = new StringBuilder();
-//        JdbcTemplate jdbcTemplate = getJdbcTemplate();
-//        String sqlString = "SELECT TABLE_NAME FROM USER_TABLES WHERE TABLESPACE_NAME='USERS'";
-//        List<String> list = jdbcTemplate.queryForList(sqlString, java.lang.String.class);
-//        if (list.size() > 0) {
-//            for (String t : list) {
-//                tables.append(t).append(",");
-//                String sql = "DROP TABLE " + t + " CASCADE CONSTRAINTS";
-//                jdbcTemplate.execute(sql);
-//                System.out.println(sql);
-//            }
-//            return tables.deleteCharAt(tables.length() - 1).toString();
-//        }
-//        return "";
-//    }
-//
-//    public void doImp(Long id) throws IOException, InterruptedException {
-//        OrclInfoDTO dto = getDTO(id);
-//        if (StringUtils.isNotBlank(dto.getFilePath())) {
-//            String tbl = dropTables();
-//            DataBaseUtils.doImp("scott", "xxfw", "XXFW", dto.getFilePath(), tbl);
-//        }
-//    }
-//
-//    public OrclInfoDTO getDTO(Long id) {
-//        return OrclInfoDTO.ConvertToDTO(get(id));
-//    }
-//
-//    public void deleteDTO(Long id) {
-//        OrclInfo orcl = get(id);
-//        File file = new File(orcl.getFilePath());
-//        file.delete();
-//        remove(orcl);
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/manager/SysLogInfoManager.java b/src/main/java/com/casic/accessControl/sys/manager/SysLogInfoManager.java
deleted file mode 100644
index a2c83a4..0000000
--- a/src/main/java/com/casic/accessControl/sys/manager/SysLogInfoManager.java
+++ /dev/null
@@ -1,92 +0,0 @@
-//package com.casic.accessControl.sys.manager;
-//
-//
-//import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-//import com.casic.accessControl.core.page.Page;
-//import com.casic.accessControl.sys.domain.SysLogInfo;
-//import com.casic.accessControl.sys.dto.ExcelInfoDTO;
-//import com.casic.accessControl.sys.dto.SysLogInfoDTO;
-//import com.casic.accessControl.util.*;
-//import com.casic.accessControl.xls.ExportExcel;
-//import org.hibernate.Criteria;
-//import org.hibernate.criterion.Order;
-//import org.hibernate.criterion.Restrictions;
-//import org.springframework.stereotype.Service;
-//
-//import java.io.FileOutputStream;
-//import java.io.IOException;
-//import java.io.OutputStream;
-//import java.text.ParseException;
-//import java.util.*;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Service
-//public class SysLogInfoManager extends HibernateEntityDao<SysLogInfo> {
-//
-//    public Criteria getCriteria() {
-//        return getSession().createCriteria(SysLogInfo.class);
-//    }
-//
-//    public DataTable<SysLogInfoDTO> pageQueryLogInfoDTO(String jsonParam, String logType, String beginDay, String endDay) throws ParseException {
-//        DataTableParameter dataTableParam = DataTableUtils.getDataTableParameterByJsonParam(jsonParam);
-//
-//        int start = dataTableParam.getiDisplayStart();
-//        int pageSize = dataTableParam.getiDisplayLength();
-//        int pageNo = (start / pageSize) + 1;
-//
-//        Criteria criteria = getCriteria();
-//        criteria.addOrder(Order.desc("id"));
-//
-//        if (StringUtils.isNotBlank(logType)) {
-//            criteria.add(Restrictions.like("logType", "%" + logType + "%"));
-//        }
-//        if (StringUtils.isNotBlank(beginDay)) {
-//            criteria.add(Restrictions.ge("logDay", DateUtils.sdf1.parse(beginDay)));
-//        }
-//        if (StringUtils.isNotBlank(endDay)) {
-//            Date date = DateUtils.sdf1.parse(endDay);
-//            Calendar calendar = Calendar.getInstance();
-//            calendar.setTime(date);
-//            calendar.add(Calendar.DATE, 1);
-//            criteria.add(Restrictions.le("logDay", calendar.getTime()));
-//        }
-//
-//        Page page = pagedQuery(criteria, pageNo, pageSize);
-//
-//        List<SysLogInfoDTO> dtoList = SysLogInfoDTO.ConvertToDTO((List<SysLogInfo>) page.getResult());
-//        DataTable<SysLogInfoDTO> dt = new DataTable<SysLogInfoDTO>();
-//        dt.setAaData(dtoList);
-//        dt.setiTotalDisplayRecords((int) page.getTotalCount());
-//        dt.setsEcho(dataTableParam.getsEcho());
-//        dt.setiTotalRecords((int) page.getTotalCount());
-//        return dt;
-//    }
-//
-//    public SysLogInfoDTO getDTO(Long id) {
-//        return SysLogInfoDTO.ConvertToDTO(get(id));
-//    }
-//
-//    public Map<String, Object> expSysLogToExcel(String logType, String beginDay, String endDay, String path) throws ParseException, IOException {
-//        Map<String, Object> map = new HashMap<String, Object>();
-//        Criteria criteria = getCriteria();
-//        criteria.add(Restrictions.like("logType", "%" + logType + "%"));
-//        if (StringUtils.isNotBlank(beginDay)) {
-//            criteria.add(Restrictions.ge("logDay", DateUtils.sdf1.parse(beginDay)));
-//        }
-//        if (StringUtils.isNotBlank(endDay)) {
-//            Calendar calendar = Calendar.getInstance();
-//            calendar.setTime(DateUtils.sdf1.parse(endDay));
-//            calendar.add(Calendar.DATE, 1);
-//            criteria.add(Restrictions.le("logDay", calendar.getTime()));
-//        }
-//        List<ExcelInfoDTO> dtoList = ExcelInfoDTO.ConvertToDTO(criteria.list());
-//        String[] headers = {"日志类型", "日志内容", "日期", "操作人"};
-//        OutputStream out = new FileOutputStream(path);
-//        ExportExcel<ExcelInfoDTO> ex = new ExportExcel<ExcelInfoDTO>();
-//        ex.exportExcel(headers, dtoList, out);
-//        map.put("success", true);
-//        return map;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/web/OrclInfoController.java b/src/main/java/com/casic/accessControl/sys/web/OrclInfoController.java
deleted file mode 100644
index 22fa833..0000000
--- a/src/main/java/com/casic/accessControl/sys/web/OrclInfoController.java
+++ /dev/null
@@ -1,96 +0,0 @@
-//package com.casic.accessControl.sys.web;
-//
-//import com.casic.accessControl.core.mapper.JsonMapper;
-//import com.casic.accessControl.sys.dto.OrclInfoDTO;
-//import com.casic.accessControl.sys.dto.SysLogInfoDTO;
-//import com.casic.accessControl.sys.manager.OrclInfoManager;
-//import com.casic.accessControl.util.DataBaseUtils;
-//import com.casic.accessControl.util.DataTable;
-//import com.casic.accessControl.util.DateUtils;
-//import com.casic.accessControl.util.StringUtils;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//
-//import javax.annotation.Resource;
-//import javax.persistence.ManyToOne;
-//import javax.servlet.http.HttpServletRequest;
-//import javax.servlet.http.HttpServletResponse;
-//import javax.servlet.http.HttpSession;
-//import java.util.Date;
-//import java.util.HashMap;
-//import java.util.Map;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Controller
-//@RequestMapping("sys")
-//public class OrclInfoController {
-//
-//    @Resource
-//    private OrclInfoManager orclInfoManager;
-//
-//    public void setOrclInfoManager(OrclInfoManager orclInfoManager) {
-//        this.orclInfoManager = orclInfoManager;
-//    }
-//
-//    @RequestMapping("orcl-info-list")
-//    public void listOrcl(String jsonParam,
-//                         @RequestParam(value = "beginDay", required = false) String beginDay,
-//                         @RequestParam(value = "endDay", required = false) String endDay,
-//                         HttpServletResponse response) {
-//        try {
-//            DataTable<OrclInfoDTO> dt = orclInfoManager.pageQueryOrclInfoDTO(jsonParam, beginDay, endDay);
-//            String json = new JsonMapper().toJson(dt);
-//            response.setCharacterEncoding("utf-8");
-//            response.getWriter().write(json);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//    }
-//
-//    @RequestMapping("orcl-info-save")
-//    @ResponseBody
-//    public Map<String, Object> saveOrcl(String memo, HttpServletRequest request) {
-//        Map<String, Object> map = new HashMap<String, Object>();
-//        try {
-//            String path = request.getSession().getServletContext().getRealPath("content\\dmp");
-//            map = orclInfoManager.backupDB(memo, path);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            map.put("success", false);
-//            map.put("message", "数据备份失败！");
-//        }
-//        return map;
-//    }
-//
-//    @RequestMapping("orcl-info-restore")
-//    @ResponseBody
-//    public Map<String, Object> restoreData(@RequestParam(value = "id", required = true) Long id) {
-//        Map<String, Object> map = new HashMap<String, Object>();
-//        try {
-//            orclInfoManager.doImp(id);
-//            map.put("success", true);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            map.put("success", false);
-//        }
-//        return map;
-//    }
-//
-//    @RequestMapping("orcl-info-delete")
-//    @ResponseBody
-//    public Map<String, Object> deleteOrclInfo(@RequestParam(value = "id", required = true) Long id) {
-//        Map<String, Object> map = new HashMap<String, Object>();
-//        try {
-//            orclInfoManager.deleteDTO(id);
-//            map.put("success", true);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            map.put("success", false);
-//        }
-//        return map;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/web/SysLogInfoController.java b/src/main/java/com/casic/accessControl/sys/web/SysLogInfoController.java
deleted file mode 100644
index 86caa76..0000000
--- a/src/main/java/com/casic/accessControl/sys/web/SysLogInfoController.java
+++ /dev/null
@@ -1,81 +0,0 @@
-//package com.casic.accessControl.sys.web;
-//
-//import com.casic.accessControl.core.ext.mail.MailConsumer;
-//import com.casic.accessControl.core.mapper.JsonMapper;
-//import com.casic.accessControl.sys.domain.SysLogInfo;
-//import com.casic.accessControl.sys.dto.SysLogInfoDTO;
-//import com.casic.accessControl.sys.manager.SysLogInfoManager;
-//import com.casic.accessControl.util.DataTable;
-//import com.casic.accessControl.xls.ExportExcel;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.ui.Model;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//
-//import javax.annotation.Resource;
-//import javax.servlet.http.HttpServletRequest;
-//import javax.servlet.http.HttpServletResponse;
-//import java.io.*;
-//import java.util.ArrayList;
-//import java.util.HashMap;
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Controller
-//@RequestMapping("sys")
-//public class SysLogInfoController {
-//
-//    @Resource
-//    private SysLogInfoManager sysLogInfoManager;
-//
-//    public void setSysLogInfoManager(SysLogInfoManager sysLogInfoManager) {
-//        this.sysLogInfoManager = sysLogInfoManager;
-//    }
-//
-//    @RequestMapping("log-info-list")
-//    public void list(String jsonParam
-//            , @RequestParam(value = "logType", required = false) String logType
-//            , @RequestParam(value = "beginDay", required = false) String beginDay
-//            , @RequestParam(value = "endDay", required = false) String endDay
-//            , HttpServletResponse response) {
-//        try {
-//            DataTable<SysLogInfoDTO> dt = sysLogInfoManager.pageQueryLogInfoDTO(jsonParam, logType, beginDay, endDay);
-//            String json = new JsonMapper().toJson(dt);
-//            response.setCharacterEncoding("utf-8");
-//            response.getWriter().write(json);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//    }
-//
-//    @RequestMapping("sys-log-msg")
-//    public String logMsg(@RequestParam(value = "id", required = true) Long id, Model model) {
-//        SysLogInfoDTO dto = sysLogInfoManager.getDTO(id);
-//        model.addAttribute("model", dto);
-//        return "sys/sys-log-msg";
-//    }
-//
-//    @RequestMapping("exp-sys-log")
-//    @ResponseBody
-//    public Map<String, Object> expSysLog(@RequestParam(value = "logType", required = false) String logType,
-//                                         @RequestParam(value = "beginDay", required = false) String beginDay,
-//                                         @RequestParam(value = "endDay", required = false) String endDay,
-//                                         HttpServletResponse response,
-//                                         HttpServletRequest request) throws IOException {
-//        Map<String, Object> map = null;
-//        try {
-//            String path = request.getSession().getServletContext().getRealPath("/") + "\\content\\xls\\log.xls";
-//            map = sysLogInfoManager.expSysLogToExcel(logType, beginDay, endDay, path);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            map = new HashMap<String, Object>();
-//            map.put("success", false);
-//            map.put("message", "Excel文件生成失败！");
-//        }
-//        return map;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/task/web/TaskController.java b/src/main/java/com/casic/accessControl/task/web/TaskController.java
index db515b4..ce1e67c 100644
--- a/src/main/java/com/casic/accessControl/task/web/TaskController.java
+++ b/src/main/java/com/casic/accessControl/task/web/TaskController.java
@@ -1,7 +1,5 @@
 package com.casic.accessControl.task.web;
 
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.manager.MarkerManager;
@@ -56,8 +54,8 @@
     @Resource
     private RoleManager roleManager;
 
-    @Resource
-    private FeatureManager featureManager;
+//    @Resource
+//    private FeatureManager featureManager;
 
     @RequestMapping("task-info-list")
     public void list(@RequestParam(required = true) String jsonParam, @RequestParam(required = false) Integer status, @RequestParam(required = false) String startDate, @RequestParam(required = false) String endDate, HttpServletResponse response, HttpSession session) {
@@ -149,9 +147,7 @@
 
     @RequestMapping("task-Save")
     @ResponseBody
-    public Map<String, Object> saveTask(@RequestParam(value = "areaId", required = true) String areaId,
-                                        @RequestParam(value = "lineId", required = true) String lineId,
-                                        @RequestParam(value = "markers", required = true) String markerIds,
+    public Map<String, Object> saveTask(@RequestParam(value = "markers", required = true) String markerIds,
                                         @RequestParam(value = "patrolerId", required = true) String patrolerId,
                                         @RequestParam(value = "description", required = true) String description,
                                         HttpSession session) {
@@ -166,21 +162,22 @@
             Task task = new Task();
             User patroler = userManager.get(Long.parseLong(patrolerId));
             List<Marker> markers = new ArrayList<Marker>();
-            if (areaId.equalsIgnoreCase(""))//绘制工单
-            {
-                markers = markerManager.getMarkerByIds(markerIds);
-            } else//按区域下发工单
-            {
-                Feature feature = null;
-                Feature line = null;
-                if (StringUtils.isNotBlank(areaId)) {
-                    feature = featureManager.get(Long.parseLong(areaId));
-                }
-                if (StringUtils.isNotBlank(lineId)) {
-                    line = featureManager.get(Long.valueOf(lineId));
-                }
-                markers = markerManager.getMarkerByFeature(feature, line);
-            }
+//            if (areaId.equalsIgnoreCase(""))//绘制工单
+//            {
+//                markers = markerManager.getMarkerByIds(markerIds);
+//            } else//按区域下发工单
+//            {
+//                Feature feature = null;
+//                Feature line = null;
+//                if (StringUtils.isNotBlank(areaId)) {
+//                    feature = featureManager.get(Long.parseLong(areaId));
+//                }
+//                if (StringUtils.isNotBlank(lineId)) {
+//                    line = featureManager.get(Long.valueOf(lineId));
+//                }
+//                markers = markerManager.getMarkerByFeature(feature, line);
+//            }
+            markers = markerManager.getMarkerByIds(markerIds);
             if (markers == null || markers.size() == 0) {
                 map.put("success", false);
                 map.put("message", "未包含标识点！");

diff --git a/src/main/java/com/casic/accessControl/feature/domain/Feature.java b/src/main/java/com/casic/accessControl/feature/domain/Feature.java
deleted file mode 100644
index c89a0c2..0000000
--- a/src/main/java/com/casic/accessControl/feature/domain/Feature.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.casic.accessControl.feature.domain;
-
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-
-import javax.persistence.*;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-//点的信息
-@Entity
-@Table(name = "feature")
-public class Feature {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private Long id;
-    @Column(name = "longitude")
-    private Double longitude;
-    @Column(name = "latitude")
-    private Double latitude;
-    @Column(name = "featureName")
-    private String featureName;
-    @Column(name = "type")
-    private int type;
-    @Column(name = "isValid")
-    private Integer isValid;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "parent")
-    private Feature parent;
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "parent")
-    private List<Feature> children;
-    @Column(name = "memo")
-    private String memo;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "owner", referencedColumnName = "id")
-    private User owner;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "company", referencedColumnName = "id")
-    private Company company;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer isValid() {
-        return isValid;
-    }
-
-    public void setValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public Feature getParent() {
-        return parent;
-    }
-
-    public void setParent(Feature parent) {
-        this.parent = parent;
-    }
-
-    public List<Feature> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<Feature> children) {
-        this.children = children;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public User getOwner() {
-        return owner;
-    }
-
-    public void setOwner(User owner) {
-        this.owner = owner;
-    }
-
-    public Company getCompany() {
-        return company;
-    }
-
-    public void setCompany(Company company) {
-        this.company = company;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java b/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
deleted file mode 100644
index 256f261..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import com.casic.accessControl.feature.domain.Feature;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/17.
- */
-public class FeatureDto {
-    private Long id;
-    private Double longitude;
-    private Double latitude;
-    private String featureName;
-    private int type;
-    private Integer isValid;
-    private String memo;
-    private Long parentId;
-
-    private String btnEdit = "<a href='#' class='btn mini blue'><i class='icon-edit'></i>编辑</a>";
-    private String btnDelete = "<a href='#' class='btn mini red'><i class='icon-trash'></i>删除</a>";
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer getIsValid() {
-        return isValid;
-    }
-
-    public void setIsValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public Long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getBtnEdit() {
-        return btnEdit;
-    }
-
-    public void setBtnEdit(String btnEdit) {
-        this.btnEdit = btnEdit;
-    }
-
-    public String getBtnDelete() {
-        return btnDelete;
-    }
-
-    public void setBtnDelete(String btnDelete) {
-        this.btnDelete = btnDelete;
-    }
-
-    public static FeatureDto convert2FeatureDto(Feature feature) {
-        if (feature == null) {
-            return null;
-        }
-        FeatureDto featureDto = new FeatureDto();
-        featureDto.setId(feature.getId());
-        featureDto.setFeatureName(feature.getFeatureName());
-        featureDto.setIsValid(feature.isValid());
-        featureDto.setLatitude(feature.getLatitude());
-        featureDto.setLongitude(feature.getLongitude());
-        featureDto.setMemo(feature.getMemo());
-        featureDto.setType(feature.getType());
-        if (feature.getParent() != null)
-            featureDto.setParentId(feature.getParent().getId());
-        return featureDto;
-    }
-
-    public static List<FeatureDto> convert2FeatureDtos(List<Feature> features) {
-        List<FeatureDto> featureDtos = new ArrayList<FeatureDto>();
-        for (Feature feature : features) {
-            featureDtos.add(convert2FeatureDto(feature));
-        }
-        return featureDtos;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java b/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
deleted file mode 100644
index 785dcba..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/19.
- */
-public class OrgDto {
-    private long id;
-
-    private String name;
-
-    private long parentId;
-
-    private List<OrgDto> children = new ArrayList<OrgDto>();
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(long parentId) {
-        this.parentId = parentId;
-    }
-
-    public List<OrgDto> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<OrgDto> children) {
-        this.children = children;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java b/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
deleted file mode 100644
index a475e21..0000000
--- a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
+++ /dev/null
@@ -1,316 +0,0 @@
-package com.casic.accessControl.feature.manager;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.core.page.Page;
-import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.marker.manager.MarkerManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.DataTableParameter;
-import com.casic.accessControl.util.DataTableUtils;
-import org.apache.commons.collections.CollectionUtils;
-import org.hibernate.Criteria;
-import org.hibernate.Query;
-import org.hibernate.criterion.Restrictions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.jdbc.object.SqlQuery;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-@Service
-public class FeatureManager extends HibernateEntityDao<Feature> {
-
-    private Logger logger = LoggerFactory.getLogger(this.getClass());
-    @Resource
-    private MarkerManager markerManager;
-
-
-    public Feature getFeatureById(Long id) {
-        Feature feature = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("id", id)).add(Restrictions.eq("isValid", 1));
-            feature = (Feature) criteria.list().get(0);
-        } catch (Exception e) {
-            return null;
-        }
-        return feature;
-    }
-
-    public FeatureDto getFeatureDtoById(Long id) {
-        return FeatureDto.convert2FeatureDto(getFeatureById(id));
-    }
-
-    /**
-     * 根据id，软删除某个点或线或片
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param ids 多个id
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public String invalidFeature(String ids) {
-        if (StringUtils.isBlank(ids) || ids.indexOf(")") != -1) {//未传入值，直接返回，防止无效查询,过滤非法请求，防止sql注入
-            return "";
-        }
-        String[] idsArr = ids.split(",");
-        StringBuilder canDeleteIds = new StringBuilder("");
-        StringBuilder cantDeleleIds = new StringBuilder("");
-        //找出能删除的和不能删除的id组合
-        for (String id : idsArr) {
-            Long longId = Long.valueOf(id);
-            if (this.isCanDelete(longId)) {
-                if (canDeleteIds.length() > 0) {
-                    canDeleteIds.append(",");
-                }
-                canDeleteIds.append(id);
-
-            } else {
-                if (cantDeleleIds.length() > 0) {
-                    cantDeleleIds.append(",");
-                }
-                cantDeleleIds.append(id);
-            }
-        }
-
-        String temp1Ids = canDeleteIds.toString();
-        String temp2Ids = cantDeleleIds.toString();
-        if (StringUtils.isNotBlank(temp2Ids)) {//有不能删除的，都不删除
-            return "";
-        }
-        Query query = this.getSession().createQuery("update Feature f set f.isValid = 0 where id in (" + temp1Ids + ")");
-        query.executeUpdate();
-
-        return "success";
-    }
-
-    /**
-     * 判断feature是否可以删除
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param id
-     * @return
-     */
-    private boolean isCanDelete(Long id) {
-        Feature feature = this.getFeatureById(id);
-        if (feature.getParent() == null) {//所有用户共用的根节点不能删除
-            return false;
-        }
-        if (CollectionUtils.isNotEmpty(feature.getChildren())) {
-            for (Feature child : feature.getChildren()) {
-                if (child.isValid() == 1) {
-                    return false;
-                }
-            }
-
-        }
-        List<Marker> markers = markerManager.getMarkerByFeature(feature);
-        if (CollectionUtils.isNotEmpty(markers)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * 将数据库中的feature信息按照参数更新
-     *
-     * @param feature
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public void saveOrupdateFeature(Feature feature, User user) {
-        this.getSession().saveOrUpdate(feature);
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param user 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByUser")
-    public List<FeatureDto> getFeaturesByUser(Integer type, User user) {
-        if (user == null) {
-            return Collections.emptyList();
-        }
-        Company company = user.getCompany();
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("type", type));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-        return FeatureDto.convert2FeatureDtos(features);
-    }
-
-    /**
-     * 分页使用，datatable获取相应type的feature某页数据
-     *
-     * @param params
-     * @param user
-     * @return
-     */
-    public DataTable<FeatureDto> getPageFeatureListByTye(String params, Feature parent, User user) {
-        DataTable<FeatureDto> result = new DataTable<FeatureDto>();
-        DataTableParameter parameter = DataTableUtils.getDataTableParameterByJsonParam(params);
-        int start = parameter.getiDisplayStart();
-        int pageSize = parameter.getiDisplayLength();
-        int pageNo = (start / pageSize) + 1;
-        Criteria criteria = this.createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        Company company = user.getCompany();
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("isValid", 1)).add(Restrictions.eq("parent", parent));
-        Page page = pagedQuery(criteria, pageNo, pageSize);
-        List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos((List<Feature>) page.getResult());
-        result.setAaData(featureDtos);
-        result.setiTotalDisplayRecords((int) page.getTotalCount());
-        result.setiTotalRecords((int) page.getTotalCount());
-        result.setsEcho(parameter.getsEcho());
-        return result;
-
-
-    }
-
-    /**
-     * 获取层次结构列表,增加缓存
-     *
-     * @param type
-     * @param company
-     * @return
-     */
-    @Cacheable(value = "getOrgList")
-    public String getOrgList(Integer type, Company company) {
-        List<OrgDto> orgDtos = new ArrayList<OrgDto>();
-        List<Feature> features = this.getRootFeatures(type);
-        for (Feature feature : features) {
-            orgDtos.add(this.getChildrenByParentId(feature.getId(), company));
-        }
-        String jsonStr = null;
-        try {
-            jsonStr = new JsonMapper().toJson(orgDtos);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return jsonStr;
-    }
-
-    //    @Cacheable(value = "getChildrenByParentId", key = "#id")
-    public OrgDto getChildrenByParentId(Long id, Company company) {
-        if (id == null) {
-            return null;
-        }
-        Feature feature = getFeatureById(id);
-        if (feature == null) {
-            return null;
-        }
-        //创建OrgDto节点
-        OrgDto orgDto = new OrgDto();
-        orgDto.setId(id); //保存ID信息
-        orgDto.setName(feature.getFeatureName());
-        if (feature.getParent() != null) {
-            orgDto.setParentId(feature.getParent().getId());
-        }
-        List<Feature> departments = this.getActiveChildrenOrgs(feature, company);
-        for (Feature fea : departments) {
-            orgDto.getChildren().add(this.getChildrenByParentId(fea.getId(), company));
-        }
-        return orgDto;
-    }
-
-    //    @Cacheable(value = "getActiveChildrenOrgs", key = "#department.getId()")
-    private List<Feature> getActiveChildrenOrgs(Feature department, Company company) {
-        List<Feature> features = new ArrayList<Feature>();
-        for (Feature feature : department.getChildren()) {
-            if (feature.isValid() == 1 && feature.getCompany().getId().equals(company.getId())) {
-                features.add(feature);
-            }
-        }
-        return features;
-    }
-
-
-    public List<Feature> getRootFeatures(Integer type) {
-        List<Feature> features = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("type", type)).add(Restrictions.isNull("parent"));
-            features = criteria.list();
-        } catch (Exception e) {
-            return Collections.emptyList();
-        }
-        return features;
-
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param company 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByCompany", key = "#company.getId()")
-    public List<Feature> getFeaturesByCompany(Company company) {
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-        criteria.add(Restrictions.eq("company", company));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-
-        for (Feature f : features) {
-            f.getChildren().toString();
-            f.getOwner().toString();
-            if (f.getParent() != null)
-                f.getParent().toString();
-        }
-        return features;
-    }
-
-    /**
-     * 根据组织结构的id获取叶子节点
-     ***重要：**已更改为包含本节点****
-     * @param type
-     * @param feature
-     * @return
-     */
-    public List<Feature> getLeafByParentId(Integer type, Feature feature) {
-        if (feature == null || feature.isValid() == 0) return Collections.emptyList();
-        List<Feature> features = new ArrayList<Feature>();
-        if (CollectionUtils.isEmpty(feature.getChildren())) {
-            features.add(feature);
-            return features;
-        }
-        List<Feature> children = feature.getChildren();
-        boolean flag = false;
-        for (Feature child : children) {
-            if (child.isValid() == 1) {
-                flag = true;
-                features.addAll(getLeafByParentId(type, child));
-            }
-        }
-//        if (!flag) {//没有有效的子节点
-            features.add(feature);
-//        }
-        return features;
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java b/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
deleted file mode 100644
index a706a36..0000000
--- a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package com.casic.accessControl.feature.web;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.Role;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.CompanyManager;
-import com.casic.accessControl.user.manager.UserManager;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.StringUtils;
-import com.casic.accessControl.xls.Common;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import sun.org.mozilla.javascript.internal.EcmaError;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.IOException;
-import java.util.*;
-
-/**
- * 提供http访问接口
- * Created by lenovo on 2016/5/16.
- */
-@Controller
-@RequestMapping(value = "feature")
-public class FeatureController {
-    @Autowired
-    private FeatureManager featureManager;
-    @Autowired
-    private UserManager userManager;
-    @Autowired
-    private CompanyManager companyManager;
-
-    @RequestMapping(value = "org-list")
-    @ResponseBody
-    public String getOrgList(@RequestParam(required = true) Integer type, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Company company = user.getCompany();
-        return featureManager.getOrgList(type, company);
-    }
-
-    @RequestMapping(value = "org-list-na")
-    @ResponseBody
-    public Map<String, String> getOrgListNa(@RequestParam Long userId) {//na端所有传过来的userid都是公司id
-        Map<String, String> res = new HashMap<String, String>();
-        res.put("message", "列表获取失败");
-        try {
-//            User user = userManager.getUserById(userId);//获取当前登录用户
-//            Company company = user.getCompany();
-            Company company = companyManager.getCompanyById(userId);
-            String areas = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.AREA.getIndex(), company);
-            String lines = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.LINE.getIndex(), company);
-            res.put("feature", areas);
-            res.put("line", lines);
-        } catch (Exception e) {
-            return res;
-        }
-        res.put("message", "成功获取");
-        return res;
-    }
-
-    @RequestMapping(value = "getFeature")
-    @ResponseBody
-    public Map<String, Object> getFeaturesByUser(@RequestParam(required = true) Integer type, HttpSession session) {
-
-        Map<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        List<FeatureDto> list = featureManager.getFeaturesByUser(type, user);
-        if (list == null) {//获取列表失败
-            result.put("message", "获取列表出现错误");
-            return result;
-        } else {
-            result.put("data", list);
-            result.put("message", "获取列表成功");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "getSubFeatureList")
-    public void getSubFeatureList(@RequestParam(required = true) String jsonParams, @RequestParam(required = false) Long parentId, HttpServletResponse response, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Feature parent = featureManager.getFeatureById(parentId);
-        DataTable<FeatureDto> dtoDataTable = featureManager.getPageFeatureListByTye(jsonParams, parent, user);
-        Gson gson = new Gson();
-        String json = gson.toJson(dtoDataTable);
-        response.setCharacterEncoding("utf-8");
-        try {
-            response.getWriter().write(json);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @RequestMapping(value = "delete")
-    @ResponseBody
-    public Map<String, Object> deleteFeatureById(@RequestParam(required = true) Long id, HttpSession session) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        try {
-            String res = featureManager.invalidFeature(id.toString());
-            if (StringUtils.isBlank(res)) {
-                result.put("message", "删除失败");
-            } else {
-                result.put("message", "删除成功");
-                result.put("success", true);
-            }
-        } catch (Exception e) {
-            result.put("message", "删除失败");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "save")
-    @ResponseBody
-    public Map<String, Object> save(@RequestParam(required = true) String params, HttpSession session) {
-        Gson gson = new Gson();
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        Map markers = gson.fromJson(params, HashMap.class);
-        String featureName = (String) markers.get("featureName");
-        String memo = (String) markers.get("memo") == null ? "" : (String) markers.get("memo");
-        Long parentId = Long.valueOf(StringUtils.isBlank((String) markers.get("parentId")) ? "-1" : (String) markers.get("parentId"));//不知为什么转过来为Double
-        Long id = Long.valueOf(StringUtils.isBlank((String) markers.get("id")) ? "-1" : (String) markers.get("id"));
-
-
-        if (StringUtils.isBlank(featureName) || parentId.equals(-1L)) {
-            result.put("message", "必要参数未传送");
-            return result;
-        }
-        Feature feature = new Feature();
-        feature.setValid(1);
-        Feature parent = featureManager.getFeatureById(parentId);
-        feature.setParent(parent);
-        feature.setFeatureName(featureName);
-        feature.setMemo(memo);
-        feature.setOwner(user);
-        feature.setCompany(user.getCompany());
-        feature.setType(parent.getType());
-        if (!id.equals(-1L)) {
-            feature.setId(id);
-        }
-        try {
-            featureManager.saveOrupdateFeature(feature, user);
-            result.put("message", "保存成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "保存失败");
-        }
-        return result;
-
-    }
-
-
-    @RequestMapping(value = "getFeatureById")
-    @ResponseBody
-    public Map<String, Object> getFeatureById(@RequestParam(required = true) Long id) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        try {
-            FeatureDto feature = featureManager.getFeatureDtoById(id);
-            result.put("data", feature);
-            result.put("message", "获取成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "获取失败");
-        }
-        return result;
-
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
index 08a290e..3f53635 100644
--- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
+++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
@@ -1,6 +1,6 @@
 package com.casic.accessControl.marker.dto;
 
-import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.domain.Feature;
 import com.casic.accessControl.marker.domain.Marker;
 import org.apache.commons.collections.CollectionUtils;
 
diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
index 080b291..7fe7434 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -4,8 +4,6 @@
 import com.casic.accessControl.core.hibernate.HibernateEntityDao;
 import com.casic.accessControl.core.page.Page;
 import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.user.domain.Company;
@@ -49,9 +47,6 @@
 public class MarkerManager extends HibernateEntityDao<Marker> {
 
     @Resource
-    private FeatureManager featureManager;
-
-    @Resource
     private UserManager userInfoManager;
 
 
@@ -154,33 +149,33 @@
 
     //获取marker
 //    @Cacheable(value = "getMarkerByFeature", key = "#feature.getId()")
-    public List<Marker> getMarkerByFeature(Feature feature) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            criteria.add(Restrictions.eq("belongLine", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            criteria.add(Restrictions.eq("belongLine", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
-    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
-            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
+//            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
     public boolean saveMarker(Marker marker) {
         try {
@@ -465,7 +460,7 @@
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setLayStyle(sheet.getCell(indexMap.get("layStyle"), i).getContents());
-                } else if(recordTypeFlag == 4) {
+                } else if (recordTypeFlag == 4) {
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setBelowType(sheet.getCell(indexMap.get("belowType"), i).getContents());
diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
index a19f2f5..7675e1f 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -2,9 +2,6 @@
 
 import com.casic.accessControl.core.ext.export.CsvExportor;
 import com.casic.accessControl.core.ext.export.TableModel;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.manager.MarkerManager;
diff --git a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java b/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
deleted file mode 100644
index e69de29..0000000
--- a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
+++ /dev/null
diff --git a/src/main/java/com/casic/accessControl/rs/FeatureResource.java b/src/main/java/com/casic/accessControl/rs/FeatureResource.java
index 68aeb97..e97f18b 100644
--- a/src/main/java/com/casic/accessControl/rs/FeatureResource.java
+++ b/src/main/java/com/casic/accessControl/rs/FeatureResource.java
@@ -1,65 +1,65 @@
-package com.casic.accessControl.rs;
-
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.UserManager;
-import com.google.gson.Gson;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import javax.annotation.Resource;
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
-* Created by admin on 2015/1/15.
-*/
-@Component
-@Path("feature")
-public class FeatureResource
-{
-    private static Logger logger = LoggerFactory.getLogger(FeatureResource.class);
-
-    @Resource
-    private UserManager userManager;
-
-    @Resource
-    private FeatureManager featureManager;
-
-    @GET
-    @Path("get")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map get(@QueryParam("userName") String userName ){
-        Map map = new HashMap<String, Object>();
-        try {
-            User user = userManager.getUserByName(userName);
-            if (user == null) {
-                map.put("success", "false");
-                map.put("message", "人员不存在！");
-                return map;
-            }
-            Company company = user.getCompany();
-            if (company!=null)
-            {
-                List<Feature> features = featureManager.getFeaturesByCompany(company);
-                List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos(features);
-                map.put("success", "true");
-                map.put("message", featureDtos);
-            }
-        }
-        catch (Exception e)
-        {
-            map.put("success", "false");
-            map.put("message", e.getMessage());
-        }
-        return  map;
-    }
-}
+//package com.casic.accessControl.rs;
+//
+//import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.dto.FeatureDto;
+//import com.casic.accessControl.feature.manager.FeatureManager;
+//import com.casic.accessControl.user.domain.Company;
+//import com.casic.accessControl.user.domain.User;
+//import com.casic.accessControl.user.manager.UserManager;
+//import com.google.gson.Gson;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.stereotype.Component;
+//import org.springframework.web.bind.annotation.RequestParam;
+//
+//import javax.annotation.Resource;
+//import javax.ws.rs.*;
+//import javax.ws.rs.core.MediaType;
+//import java.util.HashMap;
+//import java.util.List;
+//import java.util.Map;
+//
+///**
+//* Created by admin on 2015/1/15.
+//*/
+//@Component
+//@Path("feature")
+//public class FeatureResource
+//{
+//    private static Logger logger = LoggerFactory.getLogger(FeatureResource.class);
+//
+//    @Resource
+//    private UserManager userManager;
+//
+//    @Resource
+//    private FeatureManager featureManager;
+//
+//    @GET
+//    @Path("get")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public Map get(@QueryParam("userName") String userName ){
+//        Map map = new HashMap<String, Object>();
+//        try {
+//            User user = userManager.getUserByName(userName);
+//            if (user == null) {
+//                map.put("success", "false");
+//                map.put("message", "人员不存在！");
+//                return map;
+//            }
+//            Company company = user.getCompany();
+//            if (company!=null)
+//            {
+//                List<Feature> features = featureManager.getFeaturesByCompany(company);
+//                List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos(features);
+//                map.put("success", "true");
+//                map.put("message", featureDtos);
+//            }
+//        }
+//        catch (Exception e)
+//        {
+//            map.put("success", "false");
+//            map.put("message", e.getMessage());
+//        }
+//        return  map;
+//    }
+//}
diff --git a/src/main/java/com/casic/accessControl/rs/MapInfo.java b/src/main/java/com/casic/accessControl/rs/MapInfo.java
deleted file mode 100644
index a77fce9..0000000
--- a/src/main/java/com/casic/accessControl/rs/MapInfo.java
+++ /dev/null
@@ -1,131 +0,0 @@
-//package com.casic.accessControl.rs;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-///**
-// * Created by admin on 2015/8/26.
-// */
-//public class MapInfo {
-//
-//    private String mapUrl;
-//
-//    private String updateTime;
-//
-//    private String uploader;
-//
-//    private String name;
-//
-//    private String uuid;
-//
-//    private String site;
-//    /*
-//    0:草稿
-//    1：待审核
-//    2：通过
-//    3: 驳回
-//     */
-//    private String status;
-//
-//    //
-//    private int id;
-//
-//
-//    public String getMapUrl()
-//    {
-//        return mapUrl;
-//    }
-//
-//    public void setMapUrl(String mapUrl)
-//    {
-//        this.mapUrl = mapUrl;
-//    }
-//
-//    public String getUpdateTime()
-//    {
-//        return updateTime;
-//    }
-//
-//    public void setUpdateTime(String updateTime)
-//    {
-//        this.updateTime = updateTime;
-//    }
-//
-//    public String getUploader()
-//    {
-//        return uploader;
-//    }
-//
-//    public void setUploader(String uploader)
-//    {
-//        this.uploader = uploader;
-//    }
-//
-//    public String getName()
-//    {
-//        return name;
-//    }
-//
-//    public void setName(String name)
-//    {
-//        this.name = name;
-//    }
-//
-//    public String getUuid()
-//    {
-//        return uuid;
-//    }
-//
-//    public void setUuid(String uuid)
-//    {
-//        this.uuid = uuid;
-//    }
-//
-//    public String getSite()
-//    {
-//        return site;
-//    }
-//
-//    public void setSite(String site)
-//    {
-//        this.site = site;
-//    }
-//
-//    public String getStatus()
-//    {
-//        return status;
-//    }
-//
-//    public void setStatus(String status)
-//    {
-//        this.status = status;
-//    }
-//
-//    public int getId()
-//    {
-//        return id;
-//    }
-//
-//    public void setId(int id)
-//    {
-//        this.id = id;
-//    }
-//
-//    public static List<MapInfo> getMockerMaps()
-//    {
-//        List<MapInfo> maps = new ArrayList<MapInfo>();
-//        for (int i = 0; i < 20; i++)
-//        {
-//            MapInfo map = new MapInfo();
-//            map.setId(i);
-//            map.setUploader("张帆");
-//            map.setMapUrl("http://192.168.0.111:9080/accessControl/logo.jpg");
-//            map.setSite("永旺路"+i);
-//            map.setUpdateTime("2015-08-02");
-//            map.setStatus("待审核");
-//            maps.add(map);
-//        }
-//        return maps;
-//
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/rs/MarkResource.java b/src/main/java/com/casic/accessControl/rs/MarkResource.java
index 8ae4d85..cef1580 100644
--- a/src/main/java/com/casic/accessControl/rs/MarkResource.java
+++ b/src/main/java/com/casic/accessControl/rs/MarkResource.java
@@ -1,7 +1,7 @@
 package com.casic.accessControl.rs;
 
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
+//import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.manager.MarkerManager;
 import com.casic.accessControl.user.domain.Company;
@@ -35,8 +35,8 @@
     @Resource
     private MarkerManager markerManager;
 
-    @Resource
-    private FeatureManager featureManager;
+//    @Resource
+//    private FeatureManager featureManager;
 
     @GET
     @Path("post")
diff --git a/src/main/java/com/casic/accessControl/rs/UserObj.java b/src/main/java/com/casic/accessControl/rs/UserObj.java
deleted file mode 100644
index c0fe651..0000000
--- a/src/main/java/com/casic/accessControl/rs/UserObj.java
+++ /dev/null
@@ -1,61 +0,0 @@
-//package com.casic.accessControl.rs;
-//
-//import java.io.Serializable;
-//
-///**
-// * Created by admin on 2015/10/9.
-// */
-//public class UserObj implements Serializable {
-//    private String userName;
-//    private String password;
-//    private String appId;
-//    /*
-//    roles:��ɫ֮���Զ��ŷָ�
-//     */
-//    private String roles;
-//
-//    /*
-//    authorities:Ȩ��֮���Զ��ŷָ�
-//    */
-//    private String authorities;
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public String getPassword() {
-//        return password;
-//    }
-//
-//    public void setPassword(String password) {
-//        this.password = password;
-//    }
-//
-//    public String getAppId() {
-//        return appId;
-//    }
-//
-//    public void setAppId(String appId) {
-//        this.appId = appId;
-//    }
-//
-//    public String getRoles() {
-//        return roles;
-//    }
-//
-//    public void setRoles(String roles) {
-//        this.roles = roles;
-//    }
-//
-//    public String getAuthorities() {
-//        return authorities;
-//    }
-//
-//    public void setAuthorities(String authorities) {
-//        this.authorities = authorities;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java b/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java
deleted file mode 100644
index ac60ed5..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java
+++ /dev/null
@@ -1,65 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//import org.geotools.referencing.operation.transform.NADCONTransform;
-//
-//import javax.persistence.*;
-//
-///**
-// * Created by test203 on 2015/10/29.
-// */
-//@Entity
-//@Table(name = "ZX_DATABASE_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_DATABASE_INFO_ID", sequenceName = "SEQ_ZX_DATABASE_INFO_ID", allocationSize = 1, initialValue = 1)
-//public class DataBaseInfo {
-//    private Long id;
-//    private String account;
-//    private String password;
-//    private String sid;
-//    private String owner;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_ZX_DATABASE_INFO_ID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "ACCOUNT", nullable = false)
-//    public String getAccount() {
-//        return account;
-//    }
-//
-//    public void setAccount(String account) {
-//        this.account = account;
-//    }
-//
-//    @Column(name = "PASSWORD", nullable = false)
-//    public String getPassword() {
-//        return password;
-//    }
-//
-//    public void setPassword(String password) {
-//        this.password = password;
-//    }
-//
-//    @Column(name = "SID", nullable = false)
-//    public String getSid() {
-//        return sid;
-//    }
-//
-//    public void setSid(String sid) {
-//        this.sid = sid;
-//    }
-//
-//    @Column(name = "OWNER", nullable = false)
-//    public String getOwner() {
-//        return owner;
-//    }
-//
-//    public void setOwner(String owner) {
-//        this.owner = owner;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java b/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java
deleted file mode 100644
index 9578060..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java
+++ /dev/null
@@ -1,77 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//import com.casic.accessControl.org.domain.UserInfo;
-//
-//import javax.persistence.*;
-//import java.util.Date;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Entity
-//@Table(name = "ZX_ORCL_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_ORCL_INFO_ID",sequenceName = "SEQ_ZX_ORCL_INFO_ID",allocationSize = 1,initialValue = 1)
-//public class OrclInfo {
-//    private Long id;
-//    private String fileName;
-//    private String filePath;
-//    private String memo;
-//    private Date bkDay = new Date();
-//    private UserInfo userInfo;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE,generator = "SEQ_ZX_ORCL_INFO_ID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "FILE_NAME",nullable = false)
-//    public String getFileName() {
-//        return fileName;
-//    }
-//
-//    public void setFileName(String fileName) {
-//        this.fileName = fileName;
-//    }
-//
-//    @Column(name = "FILE_PATH",nullable = false)
-//    public String getFilePath() {
-//        return filePath;
-//    }
-//
-//    public void setFilePath(String filePath) {
-//        this.filePath = filePath;
-//    }
-//
-//    @Column(name = "MEMO")
-//    public String getMemo() {
-//        return memo;
-//    }
-//
-//    public void setMemo(String memo) {
-//        this.memo = memo;
-//    }
-//
-//    @Column(name = "BK_DAY")
-//    public Date getBkDay() {
-//        return bkDay;
-//    }
-//
-//    public void setBkDay(Date bkDay) {
-//        this.bkDay = bkDay;
-//    }
-//
-//    @ManyToOne(fetch = FetchType.LAZY)
-//    @JoinColumn(name = "USER_ID")
-//    public UserInfo getUserInfo() {
-//        return userInfo;
-//    }
-//
-//    public void setUserInfo(UserInfo userInfo) {
-//        this.userInfo = userInfo;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/SysLogInfo.java b/src/main/java/com/casic/accessControl/sys/domain/SysLogInfo.java
deleted file mode 100644
index 60e5583..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/SysLogInfo.java
+++ /dev/null
@@ -1,70 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//
-//import com.casic.accessControl.user.domain.UserInfo;
-//
-//import javax.persistence.*;
-//import java.io.Serializable;
-//import java.util.Date;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Entity
-//@Table(name = "ZX_SYS_LOG_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_SYS_LOG_ID",sequenceName = "SEQ_ZX_SYS_LOG_ID",allocationSize = 1,initialValue = 1)
-//public class SysLogInfo implements Serializable{
-//    private Long id;
-//    private String logType;//系统日志、运行日志、操作日志
-//    private String msg;
-//    private Date logDay = new Date();
-//    private UserInfo user;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE,generator = "SEQ_ZX_SYS_LOG_ID")
-//    @Column(name = "DBID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "LOG_TYPE",nullable = false)
-//    public String getLogType() {
-//        return logType;
-//    }
-//
-//    public void setLogType(String logType) {
-//        this.logType = logType;
-//    }
-//
-//    @Column(name = "LOG_MSG",nullable = false)
-//    public String getMsg() {
-//        return msg;
-//    }
-//
-//    public void setMsg(String msg) {
-//        this.msg = msg;
-//    }
-//
-//    @Column(name = "LOG_DAY")
-//    public Date getLogDay() {
-//        return logDay;
-//    }
-//
-//    public void setLogDay(Date logDay) {
-//        this.logDay = logDay;
-//    }
-//
-//    @ManyToOne(fetch = FetchType.LAZY)
-//    @JoinColumn(name = "USER_ID")
-//    public UserInfo getUser() {
-//        return user;
-//    }
-//
-//    public void setUser(UserInfo user) {
-//        this.user = user;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/dto/ExcelInfoDTO.java b/src/main/java/com/casic/accessControl/sys/dto/ExcelInfoDTO.java
deleted file mode 100644
index 2fe496e..0000000
--- a/src/main/java/com/casic/accessControl/sys/dto/ExcelInfoDTO.java
+++ /dev/null
@@ -1,77 +0,0 @@
-//package com.casic.accessControl.sys.dto;
-//
-//import com.casic.accessControl.sys.domain.SysLogInfo;
-//import com.casic.accessControl.util.DateUtils;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-///**
-// * Created by test203 on 2015/10/23.
-// */
-//public class ExcelInfoDTO {
-//    private String logType;//系统日志、运行日志、操作日志
-//    private String msg;
-//    private String logDay;
-//    private String userName;
-//
-//    public String getLogType() {
-//        return logType;
-//    }
-//
-//    public void setLogType(String logType) {
-//        this.logType = logType;
-//    }
-//
-//    public String getMsg() {
-//        return msg;
-//    }
-//
-//    public void setMsg(String msg) {
-//        this.msg = msg;
-//    }
-//
-//    public String getLogDay() {
-//        return logDay;
-//    }
-//
-//    public void setLogDay(String logDay) {
-//        this.logDay = logDay;
-//    }
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public static ExcelInfoDTO ConvertToDTO(SysLogInfo logInfo){
-//        if(null!=logInfo){
-//            ExcelInfoDTO dto = new ExcelInfoDTO();
-//            dto.setLogType(logInfo.getLogType());
-//            if(null!=logInfo.getLogDay()){
-//                dto.setLogDay(DateUtils.sdf2.format(logInfo.getLogDay()));
-//            }else {
-//                dto.setLogDay(" ");
-//            }
-//            dto.setMsg(logInfo.getMsg());
-//            if(null!=logInfo.getUser()){
-//                dto.setUserName(logInfo.getUser().getUserName());
-//            }else {
-//                dto.setUserName(" ");
-//            }
-//            return dto;
-//        }
-//        return new ExcelInfoDTO();
-//    }
-//
-//    public static List<ExcelInfoDTO> ConvertToDTO(List<SysLogInfo> list){
-//        List<ExcelInfoDTO> dtoList = new ArrayList<ExcelInfoDTO>();
-//        for(SysLogInfo log : list){
-//            dtoList.add(ConvertToDTO(log));
-//        }
-//        return dtoList;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/dto/OrclInfoDTO.java b/src/main/java/com/casic/accessControl/sys/dto/OrclInfoDTO.java
deleted file mode 100644
index 46a261d..0000000
--- a/src/main/java/com/casic/accessControl/sys/dto/OrclInfoDTO.java
+++ /dev/null
@@ -1,124 +0,0 @@
-//package com.casic.accessControl.sys.dto;
-//
-//import com.casic.accessControl.org.domain.UserInfo;
-//import com.casic.accessControl.shp.domain.LayerInfo;
-//import com.casic.accessControl.sys.domain.OrclInfo;
-//import com.casic.accessControl.util.DateUtils;
-//
-//import java.util.ArrayList;
-//import java.util.Date;
-//import java.util.List;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//public class OrclInfoDTO {
-//    private Long id;
-//    private String fileName;
-//    private String filePath;
-//    private String memo;
-//    private String bkDay;
-//    private Long userId;
-//    private String userName;
-//    private String btnRestor = "<a href='#' class='btn mini blue'>还原</a>";
-//    private String btnDelete = "<a href='#' class='btn mini red'>删除</a>";
-//
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    public String getFileName() {
-//        return fileName;
-//    }
-//
-//    public void setFileName(String fileName) {
-//        this.fileName = fileName;
-//    }
-//
-//    public String getFilePath() {
-//        return filePath;
-//    }
-//
-//    public void setFilePath(String filePath) {
-//        this.filePath = filePath;
-//    }
-//
-//    public String getMemo() {
-//        return memo;
-//    }
-//
-//    public void setMemo(String memo) {
-//        this.memo = memo;
-//    }
-//
-//    public String getBkDay() {
-//        return bkDay;
-//    }
-//
-//    public void setBkDay(String bkDay) {
-//        this.bkDay = bkDay;
-//    }
-//
-//    public Long getUserId() {
-//        return userId;
-//    }
-//
-//    public void setUserId(Long userId) {
-//        this.userId = userId;
-//    }
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public String getBtnRestor() {
-//        return btnRestor;
-//    }
-//
-//    public void setBtnRestor(String btnRestor) {
-//        this.btnRestor = btnRestor;
-//    }
-//
-//    public String getBtnDelete() {
-//        return btnDelete;
-//    }
-//
-//    public void setBtnDelete(String btnDelete) {
-//        this.btnDelete = btnDelete;
-//    }
-//
-//    public static OrclInfoDTO ConvertToDTO(OrclInfo orcl){
-//        if(null!=orcl){
-//            OrclInfoDTO dto = new OrclInfoDTO();
-//            dto.setId(orcl.getId());
-//            dto.setFileName(orcl.getFileName());
-//            dto.setFilePath(orcl.getFilePath());
-//            dto.setMemo(orcl.getMemo());
-//            if(null!=orcl.getBkDay()){
-//                dto.setBkDay(DateUtils.sdf1.format(orcl.getBkDay()));
-//            }
-//            if(null!=orcl.getUserInfo()){
-//                dto.setUserId(orcl.getUserInfo().getId());
-//                dto.setUserName(orcl.getUserInfo().getUsername());
-//            }
-//            return dto;
-//        }
-//        return new OrclInfoDTO();
-//    }
-//
-//    public static List<OrclInfoDTO> ConvertToDTO(List<OrclInfo> list){
-//        List<OrclInfoDTO> dtoList = new ArrayList<OrclInfoDTO>();
-//        for(OrclInfo orcl : list){
-//            dtoList.add(ConvertToDTO(orcl));
-//        }
-//        return dtoList;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/dto/SysLogInfoDTO.java b/src/main/java/com/casic/accessControl/sys/dto/SysLogInfoDTO.java
deleted file mode 100644
index 64d6c39..0000000
--- a/src/main/java/com/casic/accessControl/sys/dto/SysLogInfoDTO.java
+++ /dev/null
@@ -1,103 +0,0 @@
-//package com.casic.accessControl.sys.dto;
-//
-//import com.casic.accessControl.sys.domain.SysLogInfo;
-//import com.casic.accessControl.util.DateUtils;
-//
-//import java.util.ArrayList;
-//import java.util.Date;
-//import java.util.List;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//public class SysLogInfoDTO {
-//    private Long id;
-//    private String logType;//系统日志、运行日志、操作日志
-//    private String msg;
-//    private String logDay;
-//    private Long userId;
-//    private String userName;
-//    private String btn = "<a href='#' class='btn mini blue'>查看</a>";
-//
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    public String getLogType() {
-//        return logType;
-//    }
-//
-//    public void setLogType(String logType) {
-//        this.logType = logType;
-//    }
-//
-//    public String getMsg() {
-//        return msg;
-//    }
-//
-//    public void setMsg(String msg) {
-//        this.msg = msg;
-//    }
-//
-//    public String getLogDay() {
-//        return logDay;
-//    }
-//
-//    public void setLogDay(String logDay) {
-//        this.logDay = logDay;
-//    }
-//
-//    public Long getUserId() {
-//        return userId;
-//    }
-//
-//    public void setUserId(Long userId) {
-//        this.userId = userId;
-//    }
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public String getBtn() {
-//        return btn;
-//    }
-//
-//    public void setBtn(String btn) {
-//        this.btn = btn;
-//    }
-//
-//    public static SysLogInfoDTO ConvertToDTO(SysLogInfo log){
-//        if(null!=log){
-//            SysLogInfoDTO dto = new SysLogInfoDTO();
-//            dto.setId(log.getId());
-//            dto.setLogType(log.getLogType());
-//            if(null!=log.getLogDay()){
-//                dto.setLogDay(DateUtils.sdf2.format(log.getLogDay()));
-//            }
-//            dto.setMsg(log.getMsg());
-//            if(null!=log.getUser()){
-//                dto.setUserId(log.getUser().getId());
-//                dto.setUserName(log.getUser().getUserName());
-//            }
-//            return dto;
-//        }
-//        return new SysLogInfoDTO();
-//    }
-//
-//    public static List<SysLogInfoDTO> ConvertToDTO(List<SysLogInfo> list){
-//        List<SysLogInfoDTO> dtoList = new ArrayList<SysLogInfoDTO>();
-//        for(SysLogInfo log : list){
-//            dtoList.add(ConvertToDTO(log));
-//        }
-//        return dtoList;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/manager/DataBaseInfoManager.java b/src/main/java/com/casic/accessControl/sys/manager/DataBaseInfoManager.java
deleted file mode 100644
index b1395e6..0000000
--- a/src/main/java/com/casic/accessControl/sys/manager/DataBaseInfoManager.java
+++ /dev/null
@@ -1,19 +0,0 @@
-//package com.casic.accessControl.sys.manager;
-//
-//import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-//import com.casic.accessControl.sys.domain.DataBaseInfo;
-//import org.hibernate.Criteria;
-//import org.springframework.stereotype.Service;
-//
-///**
-// * Created by test203 on 2015/10/29.
-// */
-//@Service
-//public class DataBaseInfoManager extends HibernateEntityDao<DataBaseInfo>{
-//    public Criteria getCriteria(){
-//        return  getSession().createCriteria(DataBaseInfo.class);
-//    }
-//    public Object getDataBaseInfo(){
-//        return getCriteria().uniqueResult();
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/manager/OrclInfoManager.java b/src/main/java/com/casic/accessControl/sys/manager/OrclInfoManager.java
deleted file mode 100644
index d9804a1..0000000
--- a/src/main/java/com/casic/accessControl/sys/manager/OrclInfoManager.java
+++ /dev/null
@@ -1,127 +0,0 @@
-//package com.casic.accessControl.sys.manager;
-//
-//import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-//import com.casic.accessControl.core.page.Page;
-//import com.casic.accessControl.sys.domain.DataBaseInfo;
-//import com.casic.accessControl.sys.domain.OrclInfo;
-//import com.casic.accessControl.sys.dto.OrclInfoDTO;
-//import com.casic.accessControl.util.*;
-//import org.hibernate.Criteria;
-//import org.hibernate.criterion.Order;
-//import org.hibernate.criterion.Restrictions;
-//import org.springframework.jdbc.core.JdbcTemplate;
-//import org.springframework.stereotype.Service;
-//
-//import javax.annotation.Resource;
-//import java.io.File;
-//import java.io.IOException;
-//import java.text.ParseException;
-//import java.util.*;
-//
-///**
-//* Created by Administrator on 2015/8/17.
-//*/
-//@Service
-//public class OrclInfoManager extends HibernateEntityDao<OrclInfo> {
-//    @Resource
-//    private DataBaseInfoManager dataBaseInfoManager;
-//
-//    public void setDataBaseInfoManager(DataBaseInfoManager dataBaseInfoManager) {
-//        this.dataBaseInfoManager = dataBaseInfoManager;
-//    }
-//
-//    public Criteria getCriteria() {
-//        return getSession().createCriteria(OrclInfo.class);
-//    }
-//
-//    public DataTable<OrclInfoDTO> pageQueryOrclInfoDTO(String jsonParam, String beginDay, String endDay) throws ParseException {
-//        DataTableParameter dataTableParam = DataTableUtils.getDataTableParameterByJsonParam(jsonParam);
-//
-//        int start = dataTableParam.getiDisplayStart();
-//        int pageSize = dataTableParam.getiDisplayLength();
-//        int pageNo = (start / pageSize) + 1;
-//
-//        Criteria criteria = getCriteria();
-//        criteria.addOrder(Order.desc("id"));
-//
-//        if (StringUtils.isNotBlank(beginDay)) {
-//            criteria.add(Restrictions.ge("bkDay", DateUtils.sdf1.parse(beginDay)));
-//        }
-//        if (StringUtils.isNotBlank(endDay)) {
-//            Date date = DateUtils.sdf1.parse(endDay);
-//            Calendar calendar = Calendar.getInstance();
-//            calendar.setTime(date);
-//            calendar.add(Calendar.DATE, 1);
-//            criteria.add(Restrictions.le("bkDay", calendar.getTime()));
-//        }
-//
-//        Page page = pagedQuery(criteria, pageNo, pageSize);
-//
-//        List<OrclInfoDTO> dtoList = OrclInfoDTO.ConvertToDTO((List<OrclInfo>) page.getResult());
-//        DataTable<OrclInfoDTO> dt = new DataTable<OrclInfoDTO>();
-//        dt.setAaData(dtoList);
-//        dt.setiTotalDisplayRecords((int) page.getTotalCount());
-//        dt.setsEcho(dataTableParam.getsEcho());
-//        dt.setiTotalRecords((int) page.getTotalCount());
-//        return dt;
-//    }
-//
-//    public Map<String, Object> backupDB(String memo, String path) throws IOException, InterruptedException {
-//        Map<String, Object> map = new HashMap<String, Object>();
-//        DataBaseInfo db = (DataBaseInfo) dataBaseInfoManager.getDataBaseInfo();
-//        if (null == db) {
-//            map.put("success", false);
-//            map.put("message", "没有找到数据库配置！");
-//            return map;
-//        }
-//        String fileName = db.getSid() + DateUtils.sdfFile.format(new Date()) + ".dmp";
-//        String filePath = path + "\\" + fileName;
-//
-//        DataBaseUtils.doExp(db.getAccount(), db.getPassword(), db.getSid(), db.getOwner(), filePath);
-//
-//        OrclInfo orcl = new OrclInfo();
-//        orcl.setMemo(memo);
-//        orcl.setFileName(fileName);
-//        orcl.setFilePath(filePath);
-//        save(orcl);
-//
-//        map.put("success", true);
-//        return map;
-//    }
-//
-//    private String dropTables() {
-//        StringBuilder tables = new StringBuilder();
-//        JdbcTemplate jdbcTemplate = getJdbcTemplate();
-//        String sqlString = "SELECT TABLE_NAME FROM USER_TABLES WHERE TABLESPACE_NAME='USERS'";
-//        List<String> list = jdbcTemplate.queryForList(sqlString, java.lang.String.class);
-//        if (list.size() > 0) {
-//            for (String t : list) {
-//                tables.append(t).append(",");
-//                String sql = "DROP TABLE " + t + " CASCADE CONSTRAINTS";
-//                jdbcTemplate.execute(sql);
-//                System.out.println(sql);
-//            }
-//            return tables.deleteCharAt(tables.length() - 1).toString();
-//        }
-//        return "";
-//    }
-//
-//    public void doImp(Long id) throws IOException, InterruptedException {
-//        OrclInfoDTO dto = getDTO(id);
-//        if (StringUtils.isNotBlank(dto.getFilePath())) {
-//            String tbl = dropTables();
-//            DataBaseUtils.doImp("scott", "xxfw", "XXFW", dto.getFilePath(), tbl);
-//        }
-//    }
-//
-//    public OrclInfoDTO getDTO(Long id) {
-//        return OrclInfoDTO.ConvertToDTO(get(id));
-//    }
-//
-//    public void deleteDTO(Long id) {
-//        OrclInfo orcl = get(id);
-//        File file = new File(orcl.getFilePath());
-//        file.delete();
-//        remove(orcl);
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/manager/SysLogInfoManager.java b/src/main/java/com/casic/accessControl/sys/manager/SysLogInfoManager.java
deleted file mode 100644
index a2c83a4..0000000
--- a/src/main/java/com/casic/accessControl/sys/manager/SysLogInfoManager.java
+++ /dev/null
@@ -1,92 +0,0 @@
-//package com.casic.accessControl.sys.manager;
-//
-//
-//import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-//import com.casic.accessControl.core.page.Page;
-//import com.casic.accessControl.sys.domain.SysLogInfo;
-//import com.casic.accessControl.sys.dto.ExcelInfoDTO;
-//import com.casic.accessControl.sys.dto.SysLogInfoDTO;
-//import com.casic.accessControl.util.*;
-//import com.casic.accessControl.xls.ExportExcel;
-//import org.hibernate.Criteria;
-//import org.hibernate.criterion.Order;
-//import org.hibernate.criterion.Restrictions;
-//import org.springframework.stereotype.Service;
-//
-//import java.io.FileOutputStream;
-//import java.io.IOException;
-//import java.io.OutputStream;
-//import java.text.ParseException;
-//import java.util.*;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Service
-//public class SysLogInfoManager extends HibernateEntityDao<SysLogInfo> {
-//
-//    public Criteria getCriteria() {
-//        return getSession().createCriteria(SysLogInfo.class);
-//    }
-//
-//    public DataTable<SysLogInfoDTO> pageQueryLogInfoDTO(String jsonParam, String logType, String beginDay, String endDay) throws ParseException {
-//        DataTableParameter dataTableParam = DataTableUtils.getDataTableParameterByJsonParam(jsonParam);
-//
-//        int start = dataTableParam.getiDisplayStart();
-//        int pageSize = dataTableParam.getiDisplayLength();
-//        int pageNo = (start / pageSize) + 1;
-//
-//        Criteria criteria = getCriteria();
-//        criteria.addOrder(Order.desc("id"));
-//
-//        if (StringUtils.isNotBlank(logType)) {
-//            criteria.add(Restrictions.like("logType", "%" + logType + "%"));
-//        }
-//        if (StringUtils.isNotBlank(beginDay)) {
-//            criteria.add(Restrictions.ge("logDay", DateUtils.sdf1.parse(beginDay)));
-//        }
-//        if (StringUtils.isNotBlank(endDay)) {
-//            Date date = DateUtils.sdf1.parse(endDay);
-//            Calendar calendar = Calendar.getInstance();
-//            calendar.setTime(date);
-//            calendar.add(Calendar.DATE, 1);
-//            criteria.add(Restrictions.le("logDay", calendar.getTime()));
-//        }
-//
-//        Page page = pagedQuery(criteria, pageNo, pageSize);
-//
-//        List<SysLogInfoDTO> dtoList = SysLogInfoDTO.ConvertToDTO((List<SysLogInfo>) page.getResult());
-//        DataTable<SysLogInfoDTO> dt = new DataTable<SysLogInfoDTO>();
-//        dt.setAaData(dtoList);
-//        dt.setiTotalDisplayRecords((int) page.getTotalCount());
-//        dt.setsEcho(dataTableParam.getsEcho());
-//        dt.setiTotalRecords((int) page.getTotalCount());
-//        return dt;
-//    }
-//
-//    public SysLogInfoDTO getDTO(Long id) {
-//        return SysLogInfoDTO.ConvertToDTO(get(id));
-//    }
-//
-//    public Map<String, Object> expSysLogToExcel(String logType, String beginDay, String endDay, String path) throws ParseException, IOException {
-//        Map<String, Object> map = new HashMap<String, Object>();
-//        Criteria criteria = getCriteria();
-//        criteria.add(Restrictions.like("logType", "%" + logType + "%"));
-//        if (StringUtils.isNotBlank(beginDay)) {
-//            criteria.add(Restrictions.ge("logDay", DateUtils.sdf1.parse(beginDay)));
-//        }
-//        if (StringUtils.isNotBlank(endDay)) {
-//            Calendar calendar = Calendar.getInstance();
-//            calendar.setTime(DateUtils.sdf1.parse(endDay));
-//            calendar.add(Calendar.DATE, 1);
-//            criteria.add(Restrictions.le("logDay", calendar.getTime()));
-//        }
-//        List<ExcelInfoDTO> dtoList = ExcelInfoDTO.ConvertToDTO(criteria.list());
-//        String[] headers = {"日志类型", "日志内容", "日期", "操作人"};
-//        OutputStream out = new FileOutputStream(path);
-//        ExportExcel<ExcelInfoDTO> ex = new ExportExcel<ExcelInfoDTO>();
-//        ex.exportExcel(headers, dtoList, out);
-//        map.put("success", true);
-//        return map;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/web/OrclInfoController.java b/src/main/java/com/casic/accessControl/sys/web/OrclInfoController.java
deleted file mode 100644
index 22fa833..0000000
--- a/src/main/java/com/casic/accessControl/sys/web/OrclInfoController.java
+++ /dev/null
@@ -1,96 +0,0 @@
-//package com.casic.accessControl.sys.web;
-//
-//import com.casic.accessControl.core.mapper.JsonMapper;
-//import com.casic.accessControl.sys.dto.OrclInfoDTO;
-//import com.casic.accessControl.sys.dto.SysLogInfoDTO;
-//import com.casic.accessControl.sys.manager.OrclInfoManager;
-//import com.casic.accessControl.util.DataBaseUtils;
-//import com.casic.accessControl.util.DataTable;
-//import com.casic.accessControl.util.DateUtils;
-//import com.casic.accessControl.util.StringUtils;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//
-//import javax.annotation.Resource;
-//import javax.persistence.ManyToOne;
-//import javax.servlet.http.HttpServletRequest;
-//import javax.servlet.http.HttpServletResponse;
-//import javax.servlet.http.HttpSession;
-//import java.util.Date;
-//import java.util.HashMap;
-//import java.util.Map;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Controller
-//@RequestMapping("sys")
-//public class OrclInfoController {
-//
-//    @Resource
-//    private OrclInfoManager orclInfoManager;
-//
-//    public void setOrclInfoManager(OrclInfoManager orclInfoManager) {
-//        this.orclInfoManager = orclInfoManager;
-//    }
-//
-//    @RequestMapping("orcl-info-list")
-//    public void listOrcl(String jsonParam,
-//                         @RequestParam(value = "beginDay", required = false) String beginDay,
-//                         @RequestParam(value = "endDay", required = false) String endDay,
-//                         HttpServletResponse response) {
-//        try {
-//            DataTable<OrclInfoDTO> dt = orclInfoManager.pageQueryOrclInfoDTO(jsonParam, beginDay, endDay);
-//            String json = new JsonMapper().toJson(dt);
-//            response.setCharacterEncoding("utf-8");
-//            response.getWriter().write(json);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//    }
-//
-//    @RequestMapping("orcl-info-save")
-//    @ResponseBody
-//    public Map<String, Object> saveOrcl(String memo, HttpServletRequest request) {
-//        Map<String, Object> map = new HashMap<String, Object>();
-//        try {
-//            String path = request.getSession().getServletContext().getRealPath("content\\dmp");
-//            map = orclInfoManager.backupDB(memo, path);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            map.put("success", false);
-//            map.put("message", "数据备份失败！");
-//        }
-//        return map;
-//    }
-//
-//    @RequestMapping("orcl-info-restore")
-//    @ResponseBody
-//    public Map<String, Object> restoreData(@RequestParam(value = "id", required = true) Long id) {
-//        Map<String, Object> map = new HashMap<String, Object>();
-//        try {
-//            orclInfoManager.doImp(id);
-//            map.put("success", true);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            map.put("success", false);
-//        }
-//        return map;
-//    }
-//
-//    @RequestMapping("orcl-info-delete")
-//    @ResponseBody
-//    public Map<String, Object> deleteOrclInfo(@RequestParam(value = "id", required = true) Long id) {
-//        Map<String, Object> map = new HashMap<String, Object>();
-//        try {
-//            orclInfoManager.deleteDTO(id);
-//            map.put("success", true);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            map.put("success", false);
-//        }
-//        return map;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/web/SysLogInfoController.java b/src/main/java/com/casic/accessControl/sys/web/SysLogInfoController.java
deleted file mode 100644
index 86caa76..0000000
--- a/src/main/java/com/casic/accessControl/sys/web/SysLogInfoController.java
+++ /dev/null
@@ -1,81 +0,0 @@
-//package com.casic.accessControl.sys.web;
-//
-//import com.casic.accessControl.core.ext.mail.MailConsumer;
-//import com.casic.accessControl.core.mapper.JsonMapper;
-//import com.casic.accessControl.sys.domain.SysLogInfo;
-//import com.casic.accessControl.sys.dto.SysLogInfoDTO;
-//import com.casic.accessControl.sys.manager.SysLogInfoManager;
-//import com.casic.accessControl.util.DataTable;
-//import com.casic.accessControl.xls.ExportExcel;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.ui.Model;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//
-//import javax.annotation.Resource;
-//import javax.servlet.http.HttpServletRequest;
-//import javax.servlet.http.HttpServletResponse;
-//import java.io.*;
-//import java.util.ArrayList;
-//import java.util.HashMap;
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Controller
-//@RequestMapping("sys")
-//public class SysLogInfoController {
-//
-//    @Resource
-//    private SysLogInfoManager sysLogInfoManager;
-//
-//    public void setSysLogInfoManager(SysLogInfoManager sysLogInfoManager) {
-//        this.sysLogInfoManager = sysLogInfoManager;
-//    }
-//
-//    @RequestMapping("log-info-list")
-//    public void list(String jsonParam
-//            , @RequestParam(value = "logType", required = false) String logType
-//            , @RequestParam(value = "beginDay", required = false) String beginDay
-//            , @RequestParam(value = "endDay", required = false) String endDay
-//            , HttpServletResponse response) {
-//        try {
-//            DataTable<SysLogInfoDTO> dt = sysLogInfoManager.pageQueryLogInfoDTO(jsonParam, logType, beginDay, endDay);
-//            String json = new JsonMapper().toJson(dt);
-//            response.setCharacterEncoding("utf-8");
-//            response.getWriter().write(json);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//    }
-//
-//    @RequestMapping("sys-log-msg")
-//    public String logMsg(@RequestParam(value = "id", required = true) Long id, Model model) {
-//        SysLogInfoDTO dto = sysLogInfoManager.getDTO(id);
-//        model.addAttribute("model", dto);
-//        return "sys/sys-log-msg";
-//    }
-//
-//    @RequestMapping("exp-sys-log")
-//    @ResponseBody
-//    public Map<String, Object> expSysLog(@RequestParam(value = "logType", required = false) String logType,
-//                                         @RequestParam(value = "beginDay", required = false) String beginDay,
-//                                         @RequestParam(value = "endDay", required = false) String endDay,
-//                                         HttpServletResponse response,
-//                                         HttpServletRequest request) throws IOException {
-//        Map<String, Object> map = null;
-//        try {
-//            String path = request.getSession().getServletContext().getRealPath("/") + "\\content\\xls\\log.xls";
-//            map = sysLogInfoManager.expSysLogToExcel(logType, beginDay, endDay, path);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            map = new HashMap<String, Object>();
-//            map.put("success", false);
-//            map.put("message", "Excel文件生成失败！");
-//        }
-//        return map;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/task/web/TaskController.java b/src/main/java/com/casic/accessControl/task/web/TaskController.java
index db515b4..ce1e67c 100644
--- a/src/main/java/com/casic/accessControl/task/web/TaskController.java
+++ b/src/main/java/com/casic/accessControl/task/web/TaskController.java
@@ -1,7 +1,5 @@
 package com.casic.accessControl.task.web;
 
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.manager.MarkerManager;
@@ -56,8 +54,8 @@
     @Resource
     private RoleManager roleManager;
 
-    @Resource
-    private FeatureManager featureManager;
+//    @Resource
+//    private FeatureManager featureManager;
 
     @RequestMapping("task-info-list")
     public void list(@RequestParam(required = true) String jsonParam, @RequestParam(required = false) Integer status, @RequestParam(required = false) String startDate, @RequestParam(required = false) String endDate, HttpServletResponse response, HttpSession session) {
@@ -149,9 +147,7 @@
 
     @RequestMapping("task-Save")
     @ResponseBody
-    public Map<String, Object> saveTask(@RequestParam(value = "areaId", required = true) String areaId,
-                                        @RequestParam(value = "lineId", required = true) String lineId,
-                                        @RequestParam(value = "markers", required = true) String markerIds,
+    public Map<String, Object> saveTask(@RequestParam(value = "markers", required = true) String markerIds,
                                         @RequestParam(value = "patrolerId", required = true) String patrolerId,
                                         @RequestParam(value = "description", required = true) String description,
                                         HttpSession session) {
@@ -166,21 +162,22 @@
             Task task = new Task();
             User patroler = userManager.get(Long.parseLong(patrolerId));
             List<Marker> markers = new ArrayList<Marker>();
-            if (areaId.equalsIgnoreCase(""))//绘制工单
-            {
-                markers = markerManager.getMarkerByIds(markerIds);
-            } else//按区域下发工单
-            {
-                Feature feature = null;
-                Feature line = null;
-                if (StringUtils.isNotBlank(areaId)) {
-                    feature = featureManager.get(Long.parseLong(areaId));
-                }
-                if (StringUtils.isNotBlank(lineId)) {
-                    line = featureManager.get(Long.valueOf(lineId));
-                }
-                markers = markerManager.getMarkerByFeature(feature, line);
-            }
+//            if (areaId.equalsIgnoreCase(""))//绘制工单
+//            {
+//                markers = markerManager.getMarkerByIds(markerIds);
+//            } else//按区域下发工单
+//            {
+//                Feature feature = null;
+//                Feature line = null;
+//                if (StringUtils.isNotBlank(areaId)) {
+//                    feature = featureManager.get(Long.parseLong(areaId));
+//                }
+//                if (StringUtils.isNotBlank(lineId)) {
+//                    line = featureManager.get(Long.valueOf(lineId));
+//                }
+//                markers = markerManager.getMarkerByFeature(feature, line);
+//            }
+            markers = markerManager.getMarkerByIds(markerIds);
             if (markers == null || markers.size() == 0) {
                 map.put("success", false);
                 map.put("message", "未包含标识点！");
diff --git a/src/main/java/com/casic/accessControl/xls/ReadColumnFromExcel.java b/src/main/java/com/casic/accessControl/xls/ReadColumnFromExcel.java
deleted file mode 100644
index ead76c7..0000000
--- a/src/main/java/com/casic/accessControl/xls/ReadColumnFromExcel.java
+++ /dev/null
@@ -1,220 +0,0 @@
-//package com.casic.accessControl.xls;
-//
-//import com.casic.accessControl.shp.dto.MetaInfoDTO;
-//import org.apache.poi.hssf.usermodel.HSSFCell;
-//import org.apache.poi.hssf.usermodel.HSSFRow;
-//import org.apache.poi.hssf.usermodel.HSSFSheet;
-//import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-//import org.apache.poi.xssf.usermodel.XSSFCell;
-//import org.apache.poi.xssf.usermodel.XSSFRow;
-//import org.apache.poi.xssf.usermodel.XSSFSheet;
-//import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-//
-//import java.io.FileInputStream;
-//import java.io.IOException;
-//import java.io.InputStream;
-//import java.util.ArrayList;
-//import java.util.HashMap;
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * Created by Administrator on 2015/9/1.
-// */
-//public class ReadColumnFromExcel {
-//
-//    public static List<List<MetaInfoDTO>> readExcel(String path, Map<String, MetaInfoDTO> map) throws IOException {
-//        if (path == null || Common.EMPTY.equals(path)) {
-//            return null;
-//        } else {
-//            String postfix = Util.getPostfix(path);
-//            if (!Common.EMPTY.equals(postfix)) {
-//                if (Common.OFFICE_EXCEL_2003_POSTFIX.equals(postfix)) {
-//                    return readXls(path,map);
-//                } else if (Common.OFFICE_EXCEL_2010_POSTFIX.equals(postfix)) {
-//                    return readXlsx(path,map);
-//                }
-//            } else {
-//                System.out.println(path + Common.NOT_EXCEL_FILE);
-//            }
-//        }
-//        return new ArrayList<List<MetaInfoDTO>>();
-//    }
-//
-//    public static Map<String,Object> CheckColumnExcel(String path) throws  IOException{
-//        Map<String,Object> map = new HashMap<String, Object>();
-//        if (path == null || Common.EMPTY.equals(path)) {
-//            map.put("success",false);
-//            map.put("message","文件路径不能为空！");
-//        } else {
-//            String postfix = Util.getPostfix(path);
-//            if (!Common.EMPTY.equals(postfix)) {
-//                if (Common.OFFICE_EXCEL_2003_POSTFIX.equals(postfix)) {
-//                    map = CheckXls(path);
-//                } else if (Common.OFFICE_EXCEL_2010_POSTFIX.equals(postfix)) {
-//                    map = CheckXlsx(path);
-//                }
-//            } else {
-//                map.put("success",false);
-//                map.put("message",path + Common.NOT_EXCEL_FILE);
-//            }
-//        }
-//        return map;
-//    }
-//
-//    public static Map<String,Object> CheckXlsx(String path) {
-//        Map<String,Object> map = new HashMap<String, Object>();
-//        return map;
-//    }
-//
-//    public static Map<String, Object> CheckXls(String path) {
-//        Map<String,Object> map = new HashMap<String, Object>();
-//        return map;
-//    }
-//
-//
-//    /**
-//     * Read the Excel 2010
-//     *
-//     * @param path the path of the excel file
-//     * @param map
-//     * @return
-//     * @throws IOException
-//     */
-//    public static List<List<MetaInfoDTO>> readXlsx(String path, Map<String, MetaInfoDTO> map) throws IOException {
-//        System.out.println(Common.PROCESSING + path);
-//        InputStream is = new FileInputStream(path);
-//        XSSFWorkbook xssfWorkbook = new XSSFWorkbook(is);
-//
-//
-//        XSSFSheet xssfSheet = xssfWorkbook.getSheetAt(0);
-//        if (xssfSheet == null ) {
-//            return new ArrayList<List<MetaInfoDTO>>();
-//        }
-//
-//        //获取标题栏信息
-//        XSSFRow xssfRow = xssfSheet.getRow(0);
-//        List<String> headers = new ArrayList<String>();
-//        if (xssfRow != null) {
-//            for (int colNum = xssfRow.getFirstCellNum(); colNum < xssfRow.getLastCellNum(); colNum++) {
-//                XSSFCell cell = xssfRow.getCell(colNum);
-//                if (cell != null) {
-//                    headers.add(cell.getStringCellValue());
-//                }else {
-//                    break;
-//                }
-//            }
-//        }
-//
-//        List<List<MetaInfoDTO>> tbl = new ArrayList<List<MetaInfoDTO>>();
-//        for (int rowNum = 1; rowNum <= xssfSheet.getLastRowNum(); rowNum++) {
-//            xssfRow = xssfSheet.getRow(rowNum);
-//            if (xssfRow != null) {
-//                List<MetaInfoDTO> list = new ArrayList<MetaInfoDTO>();
-//                for (int colNum = xssfRow.getFirstCellNum(); colNum < xssfRow.getLastCellNum(); colNum++) {
-//                    XSSFCell cell = xssfRow.getCell(colNum);
-//                    if (cell != null) {
-//                        MetaInfoDTO dto = getValue(cell,map.get(headers.get(colNum)));
-//                        if(null!=dto){
-//                            list.add(dto);
-//                        }
-//                    }else {
-//                        break;
-//                    }
-//                }
-//
-//                tbl.add(list);
-//            }
-//        }
-//        return tbl;
-//    }
-//
-//    /**
-//     * Read the Excel 2003-2007
-//     *
-//     * @param path the path of the Excel
-//     * @param map
-//     * @return
-//     * @throws IOException
-//     */
-//    public static List<List<MetaInfoDTO>> readXls(String path, Map<String, MetaInfoDTO> map) throws IOException {
-//        System.out.println(Common.PROCESSING + path);
-//        InputStream is = new FileInputStream(path);
-//        HSSFWorkbook hssfWorkbook = new HSSFWorkbook(is);
-//
-//        // Read the Sheet
-//        HSSFSheet hssfSheet = hssfWorkbook.getSheetAt(0);
-//        if (hssfSheet == null ) {
-//            return new ArrayList<List<MetaInfoDTO>>();
-//        }
-//
-//        //获取标题栏信息
-//        HSSFRow hssfRow = hssfSheet.getRow(0);
-//        List<String> headers = new ArrayList<String>();
-//        if (hssfRow != null) {
-//            for (int colNum = hssfRow.getFirstCellNum(); colNum < hssfRow.getLastCellNum(); colNum++) {
-//                HSSFCell cell = hssfRow.getCell(colNum);
-//                if (cell != null) {
-//                    headers.add(cell.getStringCellValue());
-//                }else {
-//                    break;
-//                }
-//            }
-//        }
-//
-//        List<List<MetaInfoDTO>> tbl = new ArrayList<List<MetaInfoDTO>>();
-//        for (int rowNum = 1; rowNum <= hssfSheet.getLastRowNum(); rowNum++) {
-//            hssfRow = hssfSheet.getRow(rowNum);
-//            if (hssfRow != null) {
-//                List<MetaInfoDTO> list = new ArrayList<MetaInfoDTO>();
-//                for (int colNum = hssfRow.getFirstCellNum(); colNum < hssfRow.getLastCellNum(); colNum++) {
-//                    HSSFCell cell = hssfRow.getCell(colNum);
-//                    if (cell != null) {
-//                        MetaInfoDTO dto = getValue(cell, map.get(headers.get(colNum)));
-//                        if(null!=dto){
-//                            list.add(dto);
-//                        }
-//                    }else {
-//                        break;
-//                    }
-//                }
-//
-//                tbl.add(list);
-//            }
-//        }
-//
-//        return tbl;
-//    }
-//
-//    @SuppressWarnings("static-access")
-//    public static MetaInfoDTO getValue(XSSFCell xssfCell,MetaInfoDTO dto) {
-//        if(dto!=null){
-//            MetaInfoDTO t = new MetaInfoDTO();
-//            t.setLayerName(dto.getMetaName());
-//            t.setName(dto.getMetaName());
-//            t.setWidth(dto.getWidth());
-//            t.setType(dto.getType());
-//            t.setCount(dto.getCount());
-//            t.setIsNull(dto.getIsNull());
-//            t.setText(xssfCell.getStringCellValue());
-//            return t;
-//        }
-//        return null;
-//    }
-//
-//    @SuppressWarnings("static-access")
-//    public static MetaInfoDTO getValue(HSSFCell  hssfCell,MetaInfoDTO dto) {
-//        if(dto!=null){
-//            MetaInfoDTO t = new MetaInfoDTO();
-//            t.setName(dto.getMetaName());
-//            t.setLayerName(dto.getMetaName());
-//            t.setWidth(dto.getWidth());
-//            t.setType(dto.getType());
-//            t.setIsNull(dto.getIsNull());
-//            t.setCount(dto.getCount());
-//            t.setText(hssfCell.getStringCellValue());
-//            return t;
-//        }
-//        return null;
-//    }
-//}

diff --git a/src/main/java/com/casic/accessControl/feature/domain/Feature.java b/src/main/java/com/casic/accessControl/feature/domain/Feature.java
deleted file mode 100644
index c89a0c2..0000000
--- a/src/main/java/com/casic/accessControl/feature/domain/Feature.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.casic.accessControl.feature.domain;
-
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-
-import javax.persistence.*;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-//点的信息
-@Entity
-@Table(name = "feature")
-public class Feature {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private Long id;
-    @Column(name = "longitude")
-    private Double longitude;
-    @Column(name = "latitude")
-    private Double latitude;
-    @Column(name = "featureName")
-    private String featureName;
-    @Column(name = "type")
-    private int type;
-    @Column(name = "isValid")
-    private Integer isValid;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "parent")
-    private Feature parent;
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "parent")
-    private List<Feature> children;
-    @Column(name = "memo")
-    private String memo;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "owner", referencedColumnName = "id")
-    private User owner;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "company", referencedColumnName = "id")
-    private Company company;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer isValid() {
-        return isValid;
-    }
-
-    public void setValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public Feature getParent() {
-        return parent;
-    }
-
-    public void setParent(Feature parent) {
-        this.parent = parent;
-    }
-
-    public List<Feature> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<Feature> children) {
-        this.children = children;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public User getOwner() {
-        return owner;
-    }
-
-    public void setOwner(User owner) {
-        this.owner = owner;
-    }
-
-    public Company getCompany() {
-        return company;
-    }
-
-    public void setCompany(Company company) {
-        this.company = company;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java b/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
deleted file mode 100644
index 256f261..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import com.casic.accessControl.feature.domain.Feature;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/17.
- */
-public class FeatureDto {
-    private Long id;
-    private Double longitude;
-    private Double latitude;
-    private String featureName;
-    private int type;
-    private Integer isValid;
-    private String memo;
-    private Long parentId;
-
-    private String btnEdit = "<a href='#' class='btn mini blue'><i class='icon-edit'></i>编辑</a>";
-    private String btnDelete = "<a href='#' class='btn mini red'><i class='icon-trash'></i>删除</a>";
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer getIsValid() {
-        return isValid;
-    }
-
-    public void setIsValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public Long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getBtnEdit() {
-        return btnEdit;
-    }
-
-    public void setBtnEdit(String btnEdit) {
-        this.btnEdit = btnEdit;
-    }
-
-    public String getBtnDelete() {
-        return btnDelete;
-    }
-
-    public void setBtnDelete(String btnDelete) {
-        this.btnDelete = btnDelete;
-    }
-
-    public static FeatureDto convert2FeatureDto(Feature feature) {
-        if (feature == null) {
-            return null;
-        }
-        FeatureDto featureDto = new FeatureDto();
-        featureDto.setId(feature.getId());
-        featureDto.setFeatureName(feature.getFeatureName());
-        featureDto.setIsValid(feature.isValid());
-        featureDto.setLatitude(feature.getLatitude());
-        featureDto.setLongitude(feature.getLongitude());
-        featureDto.setMemo(feature.getMemo());
-        featureDto.setType(feature.getType());
-        if (feature.getParent() != null)
-            featureDto.setParentId(feature.getParent().getId());
-        return featureDto;
-    }
-
-    public static List<FeatureDto> convert2FeatureDtos(List<Feature> features) {
-        List<FeatureDto> featureDtos = new ArrayList<FeatureDto>();
-        for (Feature feature : features) {
-            featureDtos.add(convert2FeatureDto(feature));
-        }
-        return featureDtos;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java b/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
deleted file mode 100644
index 785dcba..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/19.
- */
-public class OrgDto {
-    private long id;
-
-    private String name;
-
-    private long parentId;
-
-    private List<OrgDto> children = new ArrayList<OrgDto>();
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(long parentId) {
-        this.parentId = parentId;
-    }
-
-    public List<OrgDto> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<OrgDto> children) {
-        this.children = children;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java b/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
deleted file mode 100644
index a475e21..0000000
--- a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
+++ /dev/null
@@ -1,316 +0,0 @@
-package com.casic.accessControl.feature.manager;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.core.page.Page;
-import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.marker.manager.MarkerManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.DataTableParameter;
-import com.casic.accessControl.util.DataTableUtils;
-import org.apache.commons.collections.CollectionUtils;
-import org.hibernate.Criteria;
-import org.hibernate.Query;
-import org.hibernate.criterion.Restrictions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.jdbc.object.SqlQuery;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-@Service
-public class FeatureManager extends HibernateEntityDao<Feature> {
-
-    private Logger logger = LoggerFactory.getLogger(this.getClass());
-    @Resource
-    private MarkerManager markerManager;
-
-
-    public Feature getFeatureById(Long id) {
-        Feature feature = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("id", id)).add(Restrictions.eq("isValid", 1));
-            feature = (Feature) criteria.list().get(0);
-        } catch (Exception e) {
-            return null;
-        }
-        return feature;
-    }
-
-    public FeatureDto getFeatureDtoById(Long id) {
-        return FeatureDto.convert2FeatureDto(getFeatureById(id));
-    }
-
-    /**
-     * 根据id，软删除某个点或线或片
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param ids 多个id
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public String invalidFeature(String ids) {
-        if (StringUtils.isBlank(ids) || ids.indexOf(")") != -1) {//未传入值，直接返回，防止无效查询,过滤非法请求，防止sql注入
-            return "";
-        }
-        String[] idsArr = ids.split(",");
-        StringBuilder canDeleteIds = new StringBuilder("");
-        StringBuilder cantDeleleIds = new StringBuilder("");
-        //找出能删除的和不能删除的id组合
-        for (String id : idsArr) {
-            Long longId = Long.valueOf(id);
-            if (this.isCanDelete(longId)) {
-                if (canDeleteIds.length() > 0) {
-                    canDeleteIds.append(",");
-                }
-                canDeleteIds.append(id);
-
-            } else {
-                if (cantDeleleIds.length() > 0) {
-                    cantDeleleIds.append(",");
-                }
-                cantDeleleIds.append(id);
-            }
-        }
-
-        String temp1Ids = canDeleteIds.toString();
-        String temp2Ids = cantDeleleIds.toString();
-        if (StringUtils.isNotBlank(temp2Ids)) {//有不能删除的，都不删除
-            return "";
-        }
-        Query query = this.getSession().createQuery("update Feature f set f.isValid = 0 where id in (" + temp1Ids + ")");
-        query.executeUpdate();
-
-        return "success";
-    }
-
-    /**
-     * 判断feature是否可以删除
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param id
-     * @return
-     */
-    private boolean isCanDelete(Long id) {
-        Feature feature = this.getFeatureById(id);
-        if (feature.getParent() == null) {//所有用户共用的根节点不能删除
-            return false;
-        }
-        if (CollectionUtils.isNotEmpty(feature.getChildren())) {
-            for (Feature child : feature.getChildren()) {
-                if (child.isValid() == 1) {
-                    return false;
-                }
-            }
-
-        }
-        List<Marker> markers = markerManager.getMarkerByFeature(feature);
-        if (CollectionUtils.isNotEmpty(markers)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * 将数据库中的feature信息按照参数更新
-     *
-     * @param feature
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public void saveOrupdateFeature(Feature feature, User user) {
-        this.getSession().saveOrUpdate(feature);
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param user 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByUser")
-    public List<FeatureDto> getFeaturesByUser(Integer type, User user) {
-        if (user == null) {
-            return Collections.emptyList();
-        }
-        Company company = user.getCompany();
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("type", type));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-        return FeatureDto.convert2FeatureDtos(features);
-    }
-
-    /**
-     * 分页使用，datatable获取相应type的feature某页数据
-     *
-     * @param params
-     * @param user
-     * @return
-     */
-    public DataTable<FeatureDto> getPageFeatureListByTye(String params, Feature parent, User user) {
-        DataTable<FeatureDto> result = new DataTable<FeatureDto>();
-        DataTableParameter parameter = DataTableUtils.getDataTableParameterByJsonParam(params);
-        int start = parameter.getiDisplayStart();
-        int pageSize = parameter.getiDisplayLength();
-        int pageNo = (start / pageSize) + 1;
-        Criteria criteria = this.createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        Company company = user.getCompany();
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("isValid", 1)).add(Restrictions.eq("parent", parent));
-        Page page = pagedQuery(criteria, pageNo, pageSize);
-        List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos((List<Feature>) page.getResult());
-        result.setAaData(featureDtos);
-        result.setiTotalDisplayRecords((int) page.getTotalCount());
-        result.setiTotalRecords((int) page.getTotalCount());
-        result.setsEcho(parameter.getsEcho());
-        return result;
-
-
-    }
-
-    /**
-     * 获取层次结构列表,增加缓存
-     *
-     * @param type
-     * @param company
-     * @return
-     */
-    @Cacheable(value = "getOrgList")
-    public String getOrgList(Integer type, Company company) {
-        List<OrgDto> orgDtos = new ArrayList<OrgDto>();
-        List<Feature> features = this.getRootFeatures(type);
-        for (Feature feature : features) {
-            orgDtos.add(this.getChildrenByParentId(feature.getId(), company));
-        }
-        String jsonStr = null;
-        try {
-            jsonStr = new JsonMapper().toJson(orgDtos);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return jsonStr;
-    }
-
-    //    @Cacheable(value = "getChildrenByParentId", key = "#id")
-    public OrgDto getChildrenByParentId(Long id, Company company) {
-        if (id == null) {
-            return null;
-        }
-        Feature feature = getFeatureById(id);
-        if (feature == null) {
-            return null;
-        }
-        //创建OrgDto节点
-        OrgDto orgDto = new OrgDto();
-        orgDto.setId(id); //保存ID信息
-        orgDto.setName(feature.getFeatureName());
-        if (feature.getParent() != null) {
-            orgDto.setParentId(feature.getParent().getId());
-        }
-        List<Feature> departments = this.getActiveChildrenOrgs(feature, company);
-        for (Feature fea : departments) {
-            orgDto.getChildren().add(this.getChildrenByParentId(fea.getId(), company));
-        }
-        return orgDto;
-    }
-
-    //    @Cacheable(value = "getActiveChildrenOrgs", key = "#department.getId()")
-    private List<Feature> getActiveChildrenOrgs(Feature department, Company company) {
-        List<Feature> features = new ArrayList<Feature>();
-        for (Feature feature : department.getChildren()) {
-            if (feature.isValid() == 1 && feature.getCompany().getId().equals(company.getId())) {
-                features.add(feature);
-            }
-        }
-        return features;
-    }
-
-
-    public List<Feature> getRootFeatures(Integer type) {
-        List<Feature> features = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("type", type)).add(Restrictions.isNull("parent"));
-            features = criteria.list();
-        } catch (Exception e) {
-            return Collections.emptyList();
-        }
-        return features;
-
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param company 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByCompany", key = "#company.getId()")
-    public List<Feature> getFeaturesByCompany(Company company) {
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-        criteria.add(Restrictions.eq("company", company));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-
-        for (Feature f : features) {
-            f.getChildren().toString();
-            f.getOwner().toString();
-            if (f.getParent() != null)
-                f.getParent().toString();
-        }
-        return features;
-    }
-
-    /**
-     * 根据组织结构的id获取叶子节点
-     ***重要：**已更改为包含本节点****
-     * @param type
-     * @param feature
-     * @return
-     */
-    public List<Feature> getLeafByParentId(Integer type, Feature feature) {
-        if (feature == null || feature.isValid() == 0) return Collections.emptyList();
-        List<Feature> features = new ArrayList<Feature>();
-        if (CollectionUtils.isEmpty(feature.getChildren())) {
-            features.add(feature);
-            return features;
-        }
-        List<Feature> children = feature.getChildren();
-        boolean flag = false;
-        for (Feature child : children) {
-            if (child.isValid() == 1) {
-                flag = true;
-                features.addAll(getLeafByParentId(type, child));
-            }
-        }
-//        if (!flag) {//没有有效的子节点
-            features.add(feature);
-//        }
-        return features;
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java b/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
deleted file mode 100644
index a706a36..0000000
--- a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package com.casic.accessControl.feature.web;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.Role;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.CompanyManager;
-import com.casic.accessControl.user.manager.UserManager;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.StringUtils;
-import com.casic.accessControl.xls.Common;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import sun.org.mozilla.javascript.internal.EcmaError;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.IOException;
-import java.util.*;
-
-/**
- * 提供http访问接口
- * Created by lenovo on 2016/5/16.
- */
-@Controller
-@RequestMapping(value = "feature")
-public class FeatureController {
-    @Autowired
-    private FeatureManager featureManager;
-    @Autowired
-    private UserManager userManager;
-    @Autowired
-    private CompanyManager companyManager;
-
-    @RequestMapping(value = "org-list")
-    @ResponseBody
-    public String getOrgList(@RequestParam(required = true) Integer type, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Company company = user.getCompany();
-        return featureManager.getOrgList(type, company);
-    }
-
-    @RequestMapping(value = "org-list-na")
-    @ResponseBody
-    public Map<String, String> getOrgListNa(@RequestParam Long userId) {//na端所有传过来的userid都是公司id
-        Map<String, String> res = new HashMap<String, String>();
-        res.put("message", "列表获取失败");
-        try {
-//            User user = userManager.getUserById(userId);//获取当前登录用户
-//            Company company = user.getCompany();
-            Company company = companyManager.getCompanyById(userId);
-            String areas = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.AREA.getIndex(), company);
-            String lines = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.LINE.getIndex(), company);
-            res.put("feature", areas);
-            res.put("line", lines);
-        } catch (Exception e) {
-            return res;
-        }
-        res.put("message", "成功获取");
-        return res;
-    }
-
-    @RequestMapping(value = "getFeature")
-    @ResponseBody
-    public Map<String, Object> getFeaturesByUser(@RequestParam(required = true) Integer type, HttpSession session) {
-
-        Map<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        List<FeatureDto> list = featureManager.getFeaturesByUser(type, user);
-        if (list == null) {//获取列表失败
-            result.put("message", "获取列表出现错误");
-            return result;
-        } else {
-            result.put("data", list);
-            result.put("message", "获取列表成功");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "getSubFeatureList")
-    public void getSubFeatureList(@RequestParam(required = true) String jsonParams, @RequestParam(required = false) Long parentId, HttpServletResponse response, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Feature parent = featureManager.getFeatureById(parentId);
-        DataTable<FeatureDto> dtoDataTable = featureManager.getPageFeatureListByTye(jsonParams, parent, user);
-        Gson gson = new Gson();
-        String json = gson.toJson(dtoDataTable);
-        response.setCharacterEncoding("utf-8");
-        try {
-            response.getWriter().write(json);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @RequestMapping(value = "delete")
-    @ResponseBody
-    public Map<String, Object> deleteFeatureById(@RequestParam(required = true) Long id, HttpSession session) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        try {
-            String res = featureManager.invalidFeature(id.toString());
-            if (StringUtils.isBlank(res)) {
-                result.put("message", "删除失败");
-            } else {
-                result.put("message", "删除成功");
-                result.put("success", true);
-            }
-        } catch (Exception e) {
-            result.put("message", "删除失败");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "save")
-    @ResponseBody
-    public Map<String, Object> save(@RequestParam(required = true) String params, HttpSession session) {
-        Gson gson = new Gson();
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        Map markers = gson.fromJson(params, HashMap.class);
-        String featureName = (String) markers.get("featureName");
-        String memo = (String) markers.get("memo") == null ? "" : (String) markers.get("memo");
-        Long parentId = Long.valueOf(StringUtils.isBlank((String) markers.get("parentId")) ? "-1" : (String) markers.get("parentId"));//不知为什么转过来为Double
-        Long id = Long.valueOf(StringUtils.isBlank((String) markers.get("id")) ? "-1" : (String) markers.get("id"));
-
-
-        if (StringUtils.isBlank(featureName) || parentId.equals(-1L)) {
-            result.put("message", "必要参数未传送");
-            return result;
-        }
-        Feature feature = new Feature();
-        feature.setValid(1);
-        Feature parent = featureManager.getFeatureById(parentId);
-        feature.setParent(parent);
-        feature.setFeatureName(featureName);
-        feature.setMemo(memo);
-        feature.setOwner(user);
-        feature.setCompany(user.getCompany());
-        feature.setType(parent.getType());
-        if (!id.equals(-1L)) {
-            feature.setId(id);
-        }
-        try {
-            featureManager.saveOrupdateFeature(feature, user);
-            result.put("message", "保存成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "保存失败");
-        }
-        return result;
-
-    }
-
-
-    @RequestMapping(value = "getFeatureById")
-    @ResponseBody
-    public Map<String, Object> getFeatureById(@RequestParam(required = true) Long id) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        try {
-            FeatureDto feature = featureManager.getFeatureDtoById(id);
-            result.put("data", feature);
-            result.put("message", "获取成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "获取失败");
-        }
-        return result;
-
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
index 08a290e..3f53635 100644
--- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
+++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
@@ -1,6 +1,6 @@
 package com.casic.accessControl.marker.dto;
 
-import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.domain.Feature;
 import com.casic.accessControl.marker.domain.Marker;
 import org.apache.commons.collections.CollectionUtils;
 
diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
index 080b291..7fe7434 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -4,8 +4,6 @@
 import com.casic.accessControl.core.hibernate.HibernateEntityDao;
 import com.casic.accessControl.core.page.Page;
 import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.user.domain.Company;
@@ -49,9 +47,6 @@
 public class MarkerManager extends HibernateEntityDao<Marker> {
 
     @Resource
-    private FeatureManager featureManager;
-
-    @Resource
     private UserManager userInfoManager;
 
 
@@ -154,33 +149,33 @@
 
     //获取marker
 //    @Cacheable(value = "getMarkerByFeature", key = "#feature.getId()")
-    public List<Marker> getMarkerByFeature(Feature feature) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            criteria.add(Restrictions.eq("belongLine", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            criteria.add(Restrictions.eq("belongLine", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
-    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
-            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
+//            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
     public boolean saveMarker(Marker marker) {
         try {
@@ -465,7 +460,7 @@
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setLayStyle(sheet.getCell(indexMap.get("layStyle"), i).getContents());
-                } else if(recordTypeFlag == 4) {
+                } else if (recordTypeFlag == 4) {
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setBelowType(sheet.getCell(indexMap.get("belowType"), i).getContents());
diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
index a19f2f5..7675e1f 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -2,9 +2,6 @@
 
 import com.casic.accessControl.core.ext.export.CsvExportor;
 import com.casic.accessControl.core.ext.export.TableModel;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.manager.MarkerManager;
diff --git a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java b/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
deleted file mode 100644
index e69de29..0000000
--- a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
+++ /dev/null
diff --git a/src/main/java/com/casic/accessControl/rs/FeatureResource.java b/src/main/java/com/casic/accessControl/rs/FeatureResource.java
index 68aeb97..e97f18b 100644
--- a/src/main/java/com/casic/accessControl/rs/FeatureResource.java
+++ b/src/main/java/com/casic/accessControl/rs/FeatureResource.java
@@ -1,65 +1,65 @@
-package com.casic.accessControl.rs;
-
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.UserManager;
-import com.google.gson.Gson;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import javax.annotation.Resource;
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
-* Created by admin on 2015/1/15.
-*/
-@Component
-@Path("feature")
-public class FeatureResource
-{
-    private static Logger logger = LoggerFactory.getLogger(FeatureResource.class);
-
-    @Resource
-    private UserManager userManager;
-
-    @Resource
-    private FeatureManager featureManager;
-
-    @GET
-    @Path("get")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map get(@QueryParam("userName") String userName ){
-        Map map = new HashMap<String, Object>();
-        try {
-            User user = userManager.getUserByName(userName);
-            if (user == null) {
-                map.put("success", "false");
-                map.put("message", "人员不存在！");
-                return map;
-            }
-            Company company = user.getCompany();
-            if (company!=null)
-            {
-                List<Feature> features = featureManager.getFeaturesByCompany(company);
-                List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos(features);
-                map.put("success", "true");
-                map.put("message", featureDtos);
-            }
-        }
-        catch (Exception e)
-        {
-            map.put("success", "false");
-            map.put("message", e.getMessage());
-        }
-        return  map;
-    }
-}
+//package com.casic.accessControl.rs;
+//
+//import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.dto.FeatureDto;
+//import com.casic.accessControl.feature.manager.FeatureManager;
+//import com.casic.accessControl.user.domain.Company;
+//import com.casic.accessControl.user.domain.User;
+//import com.casic.accessControl.user.manager.UserManager;
+//import com.google.gson.Gson;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.stereotype.Component;
+//import org.springframework.web.bind.annotation.RequestParam;
+//
+//import javax.annotation.Resource;
+//import javax.ws.rs.*;
+//import javax.ws.rs.core.MediaType;
+//import java.util.HashMap;
+//import java.util.List;
+//import java.util.Map;
+//
+///**
+//* Created by admin on 2015/1/15.
+//*/
+//@Component
+//@Path("feature")
+//public class FeatureResource
+//{
+//    private static Logger logger = LoggerFactory.getLogger(FeatureResource.class);
+//
+//    @Resource
+//    private UserManager userManager;
+//
+//    @Resource
+//    private FeatureManager featureManager;
+//
+//    @GET
+//    @Path("get")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public Map get(@QueryParam("userName") String userName ){
+//        Map map = new HashMap<String, Object>();
+//        try {
+//            User user = userManager.getUserByName(userName);
+//            if (user == null) {
+//                map.put("success", "false");
+//                map.put("message", "人员不存在！");
+//                return map;
+//            }
+//            Company company = user.getCompany();
+//            if (company!=null)
+//            {
+//                List<Feature> features = featureManager.getFeaturesByCompany(company);
+//                List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos(features);
+//                map.put("success", "true");
+//                map.put("message", featureDtos);
+//            }
+//        }
+//        catch (Exception e)
+//        {
+//            map.put("success", "false");
+//            map.put("message", e.getMessage());
+//        }
+//        return  map;
+//    }
+//}
diff --git a/src/main/java/com/casic/accessControl/rs/MapInfo.java b/src/main/java/com/casic/accessControl/rs/MapInfo.java
deleted file mode 100644
index a77fce9..0000000
--- a/src/main/java/com/casic/accessControl/rs/MapInfo.java
+++ /dev/null
@@ -1,131 +0,0 @@
-//package com.casic.accessControl.rs;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-///**
-// * Created by admin on 2015/8/26.
-// */
-//public class MapInfo {
-//
-//    private String mapUrl;
-//
-//    private String updateTime;
-//
-//    private String uploader;
-//
-//    private String name;
-//
-//    private String uuid;
-//
-//    private String site;
-//    /*
-//    0:草稿
-//    1：待审核
-//    2：通过
-//    3: 驳回
-//     */
-//    private String status;
-//
-//    //
-//    private int id;
-//
-//
-//    public String getMapUrl()
-//    {
-//        return mapUrl;
-//    }
-//
-//    public void setMapUrl(String mapUrl)
-//    {
-//        this.mapUrl = mapUrl;
-//    }
-//
-//    public String getUpdateTime()
-//    {
-//        return updateTime;
-//    }
-//
-//    public void setUpdateTime(String updateTime)
-//    {
-//        this.updateTime = updateTime;
-//    }
-//
-//    public String getUploader()
-//    {
-//        return uploader;
-//    }
-//
-//    public void setUploader(String uploader)
-//    {
-//        this.uploader = uploader;
-//    }
-//
-//    public String getName()
-//    {
-//        return name;
-//    }
-//
-//    public void setName(String name)
-//    {
-//        this.name = name;
-//    }
-//
-//    public String getUuid()
-//    {
-//        return uuid;
-//    }
-//
-//    public void setUuid(String uuid)
-//    {
-//        this.uuid = uuid;
-//    }
-//
-//    public String getSite()
-//    {
-//        return site;
-//    }
-//
-//    public void setSite(String site)
-//    {
-//        this.site = site;
-//    }
-//
-//    public String getStatus()
-//    {
-//        return status;
-//    }
-//
-//    public void setStatus(String status)
-//    {
-//        this.status = status;
-//    }
-//
-//    public int getId()
-//    {
-//        return id;
-//    }
-//
-//    public void setId(int id)
-//    {
-//        this.id = id;
-//    }
-//
-//    public static List<MapInfo> getMockerMaps()
-//    {
-//        List<MapInfo> maps = new ArrayList<MapInfo>();
-//        for (int i = 0; i < 20; i++)
-//        {
-//            MapInfo map = new MapInfo();
-//            map.setId(i);
-//            map.setUploader("张帆");
-//            map.setMapUrl("http://192.168.0.111:9080/accessControl/logo.jpg");
-//            map.setSite("永旺路"+i);
-//            map.setUpdateTime("2015-08-02");
-//            map.setStatus("待审核");
-//            maps.add(map);
-//        }
-//        return maps;
-//
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/rs/MarkResource.java b/src/main/java/com/casic/accessControl/rs/MarkResource.java
index 8ae4d85..cef1580 100644
--- a/src/main/java/com/casic/accessControl/rs/MarkResource.java
+++ b/src/main/java/com/casic/accessControl/rs/MarkResource.java
@@ -1,7 +1,7 @@
 package com.casic.accessControl.rs;
 
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
+//import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.manager.MarkerManager;
 import com.casic.accessControl.user.domain.Company;
@@ -35,8 +35,8 @@
     @Resource
     private MarkerManager markerManager;
 
-    @Resource
-    private FeatureManager featureManager;
+//    @Resource
+//    private FeatureManager featureManager;
 
     @GET
     @Path("post")
diff --git a/src/main/java/com/casic/accessControl/rs/UserObj.java b/src/main/java/com/casic/accessControl/rs/UserObj.java
deleted file mode 100644
index c0fe651..0000000
--- a/src/main/java/com/casic/accessControl/rs/UserObj.java
+++ /dev/null
@@ -1,61 +0,0 @@
-//package com.casic.accessControl.rs;
-//
-//import java.io.Serializable;
-//
-///**
-// * Created by admin on 2015/10/9.
-// */
-//public class UserObj implements Serializable {
-//    private String userName;
-//    private String password;
-//    private String appId;
-//    /*
-//    roles:��ɫ֮���Զ��ŷָ�
-//     */
-//    private String roles;
-//
-//    /*
-//    authorities:Ȩ��֮���Զ��ŷָ�
-//    */
-//    private String authorities;
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public String getPassword() {
-//        return password;
-//    }
-//
-//    public void setPassword(String password) {
-//        this.password = password;
-//    }
-//
-//    public String getAppId() {
-//        return appId;
-//    }
-//
-//    public void setAppId(String appId) {
-//        this.appId = appId;
-//    }
-//
-//    public String getRoles() {
-//        return roles;
-//    }
-//
-//    public void setRoles(String roles) {
-//        this.roles = roles;
-//    }
-//
-//    public String getAuthorities() {
-//        return authorities;
-//    }
-//
-//    public void setAuthorities(String authorities) {
-//        this.authorities = authorities;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java b/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java
deleted file mode 100644
index ac60ed5..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java
+++ /dev/null
@@ -1,65 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//import org.geotools.referencing.operation.transform.NADCONTransform;
-//
-//import javax.persistence.*;
-//
-///**
-// * Created by test203 on 2015/10/29.
-// */
-//@Entity
-//@Table(name = "ZX_DATABASE_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_DATABASE_INFO_ID", sequenceName = "SEQ_ZX_DATABASE_INFO_ID", allocationSize = 1, initialValue = 1)
-//public class DataBaseInfo {
-//    private Long id;
-//    private String account;
-//    private String password;
-//    private String sid;
-//    private String owner;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_ZX_DATABASE_INFO_ID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "ACCOUNT", nullable = false)
-//    public String getAccount() {
-//        return account;
-//    }
-//
-//    public void setAccount(String account) {
-//        this.account = account;
-//    }
-//
-//    @Column(name = "PASSWORD", nullable = false)
-//    public String getPassword() {
-//        return password;
-//    }
-//
-//    public void setPassword(String password) {
-//        this.password = password;
-//    }
-//
-//    @Column(name = "SID", nullable = false)
-//    public String getSid() {
-//        return sid;
-//    }
-//
-//    public void setSid(String sid) {
-//        this.sid = sid;
-//    }
-//
-//    @Column(name = "OWNER", nullable = false)
-//    public String getOwner() {
-//        return owner;
-//    }
-//
-//    public void setOwner(String owner) {
-//        this.owner = owner;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java b/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java
deleted file mode 100644
index 9578060..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java
+++ /dev/null
@@ -1,77 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//import com.casic.accessControl.org.domain.UserInfo;
-//
-//import javax.persistence.*;
-//import java.util.Date;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Entity
-//@Table(name = "ZX_ORCL_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_ORCL_INFO_ID",sequenceName = "SEQ_ZX_ORCL_INFO_ID",allocationSize = 1,initialValue = 1)
-//public class OrclInfo {
-//    private Long id;
-//    private String fileName;
-//    private String filePath;
-//    private String memo;
-//    private Date bkDay = new Date();
-//    private UserInfo userInfo;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE,generator = "SEQ_ZX_ORCL_INFO_ID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "FILE_NAME",nullable = false)
-//    public String getFileName() {
-//        return fileName;
-//    }
-//
-//    public void setFileName(String fileName) {
-//        this.fileName = fileName;
-//    }
-//
-//    @Column(name = "FILE_PATH",nullable = false)
-//    public String getFilePath() {
-//        return filePath;
-//    }
-//
-//    public void setFilePath(String filePath) {
-//        this.filePath = filePath;
-//    }
-//
-//    @Column(name = "MEMO")
-//    public String getMemo() {
-//        return memo;
-//    }
-//
-//    public void setMemo(String memo) {
-//        this.memo = memo;
-//    }
-//
-//    @Column(name = "BK_DAY")
-//    public Date getBkDay() {
-//        return bkDay;
-//    }
-//
-//    public void setBkDay(Date bkDay) {
-//        this.bkDay = bkDay;
-//    }
-//
-//    @ManyToOne(fetch = FetchType.LAZY)
-//    @JoinColumn(name = "USER_ID")
-//    public UserInfo getUserInfo() {
-//        return userInfo;
-//    }
-//
-//    public void setUserInfo(UserInfo userInfo) {
-//        this.userInfo = userInfo;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/SysLogInfo.java b/src/main/java/com/casic/accessControl/sys/domain/SysLogInfo.java
deleted file mode 100644
index 60e5583..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/SysLogInfo.java
+++ /dev/null
@@ -1,70 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//
-//import com.casic.accessControl.user.domain.UserInfo;
-//
-//import javax.persistence.*;
-//import java.io.Serializable;
-//import java.util.Date;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Entity
-//@Table(name = "ZX_SYS_LOG_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_SYS_LOG_ID",sequenceName = "SEQ_ZX_SYS_LOG_ID",allocationSize = 1,initialValue = 1)
-//public class SysLogInfo implements Serializable{
-//    private Long id;
-//    private String logType;//系统日志、运行日志、操作日志
-//    private String msg;
-//    private Date logDay = new Date();
-//    private UserInfo user;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE,generator = "SEQ_ZX_SYS_LOG_ID")
-//    @Column(name = "DBID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "LOG_TYPE",nullable = false)
-//    public String getLogType() {
-//        return logType;
-//    }
-//
-//    public void setLogType(String logType) {
-//        this.logType = logType;
-//    }
-//
-//    @Column(name = "LOG_MSG",nullable = false)
-//    public String getMsg() {
-//        return msg;
-//    }
-//
-//    public void setMsg(String msg) {
-//        this.msg = msg;
-//    }
-//
-//    @Column(name = "LOG_DAY")
-//    public Date getLogDay() {
-//        return logDay;
-//    }
-//
-//    public void setLogDay(Date logDay) {
-//        this.logDay = logDay;
-//    }
-//
-//    @ManyToOne(fetch = FetchType.LAZY)
-//    @JoinColumn(name = "USER_ID")
-//    public UserInfo getUser() {
-//        return user;
-//    }
-//
-//    public void setUser(UserInfo user) {
-//        this.user = user;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/dto/ExcelInfoDTO.java b/src/main/java/com/casic/accessControl/sys/dto/ExcelInfoDTO.java
deleted file mode 100644
index 2fe496e..0000000
--- a/src/main/java/com/casic/accessControl/sys/dto/ExcelInfoDTO.java
+++ /dev/null
@@ -1,77 +0,0 @@
-//package com.casic.accessControl.sys.dto;
-//
-//import com.casic.accessControl.sys.domain.SysLogInfo;
-//import com.casic.accessControl.util.DateUtils;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-///**
-// * Created by test203 on 2015/10/23.
-// */
-//public class ExcelInfoDTO {
-//    private String logType;//系统日志、运行日志、操作日志
-//    private String msg;
-//    private String logDay;
-//    private String userName;
-//
-//    public String getLogType() {
-//        return logType;
-//    }
-//
-//    public void setLogType(String logType) {
-//        this.logType = logType;
-//    }
-//
-//    public String getMsg() {
-//        return msg;
-//    }
-//
-//    public void setMsg(String msg) {
-//        this.msg = msg;
-//    }
-//
-//    public String getLogDay() {
-//        return logDay;
-//    }
-//
-//    public void setLogDay(String logDay) {
-//        this.logDay = logDay;
-//    }
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public static ExcelInfoDTO ConvertToDTO(SysLogInfo logInfo){
-//        if(null!=logInfo){
-//            ExcelInfoDTO dto = new ExcelInfoDTO();
-//            dto.setLogType(logInfo.getLogType());
-//            if(null!=logInfo.getLogDay()){
-//                dto.setLogDay(DateUtils.sdf2.format(logInfo.getLogDay()));
-//            }else {
-//                dto.setLogDay(" ");
-//            }
-//            dto.setMsg(logInfo.getMsg());
-//            if(null!=logInfo.getUser()){
-//                dto.setUserName(logInfo.getUser().getUserName());
-//            }else {
-//                dto.setUserName(" ");
-//            }
-//            return dto;
-//        }
-//        return new ExcelInfoDTO();
-//    }
-//
-//    public static List<ExcelInfoDTO> ConvertToDTO(List<SysLogInfo> list){
-//        List<ExcelInfoDTO> dtoList = new ArrayList<ExcelInfoDTO>();
-//        for(SysLogInfo log : list){
-//            dtoList.add(ConvertToDTO(log));
-//        }
-//        return dtoList;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/dto/OrclInfoDTO.java b/src/main/java/com/casic/accessControl/sys/dto/OrclInfoDTO.java
deleted file mode 100644
index 46a261d..0000000
--- a/src/main/java/com/casic/accessControl/sys/dto/OrclInfoDTO.java
+++ /dev/null
@@ -1,124 +0,0 @@
-//package com.casic.accessControl.sys.dto;
-//
-//import com.casic.accessControl.org.domain.UserInfo;
-//import com.casic.accessControl.shp.domain.LayerInfo;
-//import com.casic.accessControl.sys.domain.OrclInfo;
-//import com.casic.accessControl.util.DateUtils;
-//
-//import java.util.ArrayList;
-//import java.util.Date;
-//import java.util.List;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//public class OrclInfoDTO {
-//    private Long id;
-//    private String fileName;
-//    private String filePath;
-//    private String memo;
-//    private String bkDay;
-//    private Long userId;
-//    private String userName;
-//    private String btnRestor = "<a href='#' class='btn mini blue'>还原</a>";
-//    private String btnDelete = "<a href='#' class='btn mini red'>删除</a>";
-//
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    public String getFileName() {
-//        return fileName;
-//    }
-//
-//    public void setFileName(String fileName) {
-//        this.fileName = fileName;
-//    }
-//
-//    public String getFilePath() {
-//        return filePath;
-//    }
-//
-//    public void setFilePath(String filePath) {
-//        this.filePath = filePath;
-//    }
-//
-//    public String getMemo() {
-//        return memo;
-//    }
-//
-//    public void setMemo(String memo) {
-//        this.memo = memo;
-//    }
-//
-//    public String getBkDay() {
-//        return bkDay;
-//    }
-//
-//    public void setBkDay(String bkDay) {
-//        this.bkDay = bkDay;
-//    }
-//
-//    public Long getUserId() {
-//        return userId;
-//    }
-//
-//    public void setUserId(Long userId) {
-//        this.userId = userId;
-//    }
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public String getBtnRestor() {
-//        return btnRestor;
-//    }
-//
-//    public void setBtnRestor(String btnRestor) {
-//        this.btnRestor = btnRestor;
-//    }
-//
-//    public String getBtnDelete() {
-//        return btnDelete;
-//    }
-//
-//    public void setBtnDelete(String btnDelete) {
-//        this.btnDelete = btnDelete;
-//    }
-//
-//    public static OrclInfoDTO ConvertToDTO(OrclInfo orcl){
-//        if(null!=orcl){
-//            OrclInfoDTO dto = new OrclInfoDTO();
-//            dto.setId(orcl.getId());
-//            dto.setFileName(orcl.getFileName());
-//            dto.setFilePath(orcl.getFilePath());
-//            dto.setMemo(orcl.getMemo());
-//            if(null!=orcl.getBkDay()){
-//                dto.setBkDay(DateUtils.sdf1.format(orcl.getBkDay()));
-//            }
-//            if(null!=orcl.getUserInfo()){
-//                dto.setUserId(orcl.getUserInfo().getId());
-//                dto.setUserName(orcl.getUserInfo().getUsername());
-//            }
-//            return dto;
-//        }
-//        return new OrclInfoDTO();
-//    }
-//
-//    public static List<OrclInfoDTO> ConvertToDTO(List<OrclInfo> list){
-//        List<OrclInfoDTO> dtoList = new ArrayList<OrclInfoDTO>();
-//        for(OrclInfo orcl : list){
-//            dtoList.add(ConvertToDTO(orcl));
-//        }
-//        return dtoList;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/dto/SysLogInfoDTO.java b/src/main/java/com/casic/accessControl/sys/dto/SysLogInfoDTO.java
deleted file mode 100644
index 64d6c39..0000000
--- a/src/main/java/com/casic/accessControl/sys/dto/SysLogInfoDTO.java
+++ /dev/null
@@ -1,103 +0,0 @@
-//package com.casic.accessControl.sys.dto;
-//
-//import com.casic.accessControl.sys.domain.SysLogInfo;
-//import com.casic.accessControl.util.DateUtils;
-//
-//import java.util.ArrayList;
-//import java.util.Date;
-//import java.util.List;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//public class SysLogInfoDTO {
-//    private Long id;
-//    private String logType;//系统日志、运行日志、操作日志
-//    private String msg;
-//    private String logDay;
-//    private Long userId;
-//    private String userName;
-//    private String btn = "<a href='#' class='btn mini blue'>查看</a>";
-//
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    public String getLogType() {
-//        return logType;
-//    }
-//
-//    public void setLogType(String logType) {
-//        this.logType = logType;
-//    }
-//
-//    public String getMsg() {
-//        return msg;
-//    }
-//
-//    public void setMsg(String msg) {
-//        this.msg = msg;
-//    }
-//
-//    public String getLogDay() {
-//        return logDay;
-//    }
-//
-//    public void setLogDay(String logDay) {
-//        this.logDay = logDay;
-//    }
-//
-//    public Long getUserId() {
-//        return userId;
-//    }
-//
-//    public void setUserId(Long userId) {
-//        this.userId = userId;
-//    }
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public String getBtn() {
-//        return btn;
-//    }
-//
-//    public void setBtn(String btn) {
-//        this.btn = btn;
-//    }
-//
-//    public static SysLogInfoDTO ConvertToDTO(SysLogInfo log){
-//        if(null!=log){
-//            SysLogInfoDTO dto = new SysLogInfoDTO();
-//            dto.setId(log.getId());
-//            dto.setLogType(log.getLogType());
-//            if(null!=log.getLogDay()){
-//                dto.setLogDay(DateUtils.sdf2.format(log.getLogDay()));
-//            }
-//            dto.setMsg(log.getMsg());
-//            if(null!=log.getUser()){
-//                dto.setUserId(log.getUser().getId());
-//                dto.setUserName(log.getUser().getUserName());
-//            }
-//            return dto;
-//        }
-//        return new SysLogInfoDTO();
-//    }
-//
-//    public static List<SysLogInfoDTO> ConvertToDTO(List<SysLogInfo> list){
-//        List<SysLogInfoDTO> dtoList = new ArrayList<SysLogInfoDTO>();
-//        for(SysLogInfo log : list){
-//            dtoList.add(ConvertToDTO(log));
-//        }
-//        return dtoList;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/manager/DataBaseInfoManager.java b/src/main/java/com/casic/accessControl/sys/manager/DataBaseInfoManager.java
deleted file mode 100644
index b1395e6..0000000
--- a/src/main/java/com/casic/accessControl/sys/manager/DataBaseInfoManager.java
+++ /dev/null
@@ -1,19 +0,0 @@
-//package com.casic.accessControl.sys.manager;
-//
-//import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-//import com.casic.accessControl.sys.domain.DataBaseInfo;
-//import org.hibernate.Criteria;
-//import org.springframework.stereotype.Service;
-//
-///**
-// * Created by test203 on 2015/10/29.
-// */
-//@Service
-//public class DataBaseInfoManager extends HibernateEntityDao<DataBaseInfo>{
-//    public Criteria getCriteria(){
-//        return  getSession().createCriteria(DataBaseInfo.class);
-//    }
-//    public Object getDataBaseInfo(){
-//        return getCriteria().uniqueResult();
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/manager/OrclInfoManager.java b/src/main/java/com/casic/accessControl/sys/manager/OrclInfoManager.java
deleted file mode 100644
index d9804a1..0000000
--- a/src/main/java/com/casic/accessControl/sys/manager/OrclInfoManager.java
+++ /dev/null
@@ -1,127 +0,0 @@
-//package com.casic.accessControl.sys.manager;
-//
-//import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-//import com.casic.accessControl.core.page.Page;
-//import com.casic.accessControl.sys.domain.DataBaseInfo;
-//import com.casic.accessControl.sys.domain.OrclInfo;
-//import com.casic.accessControl.sys.dto.OrclInfoDTO;
-//import com.casic.accessControl.util.*;
-//import org.hibernate.Criteria;
-//import org.hibernate.criterion.Order;
-//import org.hibernate.criterion.Restrictions;
-//import org.springframework.jdbc.core.JdbcTemplate;
-//import org.springframework.stereotype.Service;
-//
-//import javax.annotation.Resource;
-//import java.io.File;
-//import java.io.IOException;
-//import java.text.ParseException;
-//import java.util.*;
-//
-///**
-//* Created by Administrator on 2015/8/17.
-//*/
-//@Service
-//public class OrclInfoManager extends HibernateEntityDao<OrclInfo> {
-//    @Resource
-//    private DataBaseInfoManager dataBaseInfoManager;
-//
-//    public void setDataBaseInfoManager(DataBaseInfoManager dataBaseInfoManager) {
-//        this.dataBaseInfoManager = dataBaseInfoManager;
-//    }
-//
-//    public Criteria getCriteria() {
-//        return getSession().createCriteria(OrclInfo.class);
-//    }
-//
-//    public DataTable<OrclInfoDTO> pageQueryOrclInfoDTO(String jsonParam, String beginDay, String endDay) throws ParseException {
-//        DataTableParameter dataTableParam = DataTableUtils.getDataTableParameterByJsonParam(jsonParam);
-//
-//        int start = dataTableParam.getiDisplayStart();
-//        int pageSize = dataTableParam.getiDisplayLength();
-//        int pageNo = (start / pageSize) + 1;
-//
-//        Criteria criteria = getCriteria();
-//        criteria.addOrder(Order.desc("id"));
-//
-//        if (StringUtils.isNotBlank(beginDay)) {
-//            criteria.add(Restrictions.ge("bkDay", DateUtils.sdf1.parse(beginDay)));
-//        }
-//        if (StringUtils.isNotBlank(endDay)) {
-//            Date date = DateUtils.sdf1.parse(endDay);
-//            Calendar calendar = Calendar.getInstance();
-//            calendar.setTime(date);
-//            calendar.add(Calendar.DATE, 1);
-//            criteria.add(Restrictions.le("bkDay", calendar.getTime()));
-//        }
-//
-//        Page page = pagedQuery(criteria, pageNo, pageSize);
-//
-//        List<OrclInfoDTO> dtoList = OrclInfoDTO.ConvertToDTO((List<OrclInfo>) page.getResult());
-//        DataTable<OrclInfoDTO> dt = new DataTable<OrclInfoDTO>();
-//        dt.setAaData(dtoList);
-//        dt.setiTotalDisplayRecords((int) page.getTotalCount());
-//        dt.setsEcho(dataTableParam.getsEcho());
-//        dt.setiTotalRecords((int) page.getTotalCount());
-//        return dt;
-//    }
-//
-//    public Map<String, Object> backupDB(String memo, String path) throws IOException, InterruptedException {
-//        Map<String, Object> map = new HashMap<String, Object>();
-//        DataBaseInfo db = (DataBaseInfo) dataBaseInfoManager.getDataBaseInfo();
-//        if (null == db) {
-//            map.put("success", false);
-//            map.put("message", "没有找到数据库配置！");
-//            return map;
-//        }
-//        String fileName = db.getSid() + DateUtils.sdfFile.format(new Date()) + ".dmp";
-//        String filePath = path + "\\" + fileName;
-//
-//        DataBaseUtils.doExp(db.getAccount(), db.getPassword(), db.getSid(), db.getOwner(), filePath);
-//
-//        OrclInfo orcl = new OrclInfo();
-//        orcl.setMemo(memo);
-//        orcl.setFileName(fileName);
-//        orcl.setFilePath(filePath);
-//        save(orcl);
-//
-//        map.put("success", true);
-//        return map;
-//    }
-//
-//    private String dropTables() {
-//        StringBuilder tables = new StringBuilder();
-//        JdbcTemplate jdbcTemplate = getJdbcTemplate();
-//        String sqlString = "SELECT TABLE_NAME FROM USER_TABLES WHERE TABLESPACE_NAME='USERS'";
-//        List<String> list = jdbcTemplate.queryForList(sqlString, java.lang.String.class);
-//        if (list.size() > 0) {
-//            for (String t : list) {
-//                tables.append(t).append(",");
-//                String sql = "DROP TABLE " + t + " CASCADE CONSTRAINTS";
-//                jdbcTemplate.execute(sql);
-//                System.out.println(sql);
-//            }
-//            return tables.deleteCharAt(tables.length() - 1).toString();
-//        }
-//        return "";
-//    }
-//
-//    public void doImp(Long id) throws IOException, InterruptedException {
-//        OrclInfoDTO dto = getDTO(id);
-//        if (StringUtils.isNotBlank(dto.getFilePath())) {
-//            String tbl = dropTables();
-//            DataBaseUtils.doImp("scott", "xxfw", "XXFW", dto.getFilePath(), tbl);
-//        }
-//    }
-//
-//    public OrclInfoDTO getDTO(Long id) {
-//        return OrclInfoDTO.ConvertToDTO(get(id));
-//    }
-//
-//    public void deleteDTO(Long id) {
-//        OrclInfo orcl = get(id);
-//        File file = new File(orcl.getFilePath());
-//        file.delete();
-//        remove(orcl);
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/manager/SysLogInfoManager.java b/src/main/java/com/casic/accessControl/sys/manager/SysLogInfoManager.java
deleted file mode 100644
index a2c83a4..0000000
--- a/src/main/java/com/casic/accessControl/sys/manager/SysLogInfoManager.java
+++ /dev/null
@@ -1,92 +0,0 @@
-//package com.casic.accessControl.sys.manager;
-//
-//
-//import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-//import com.casic.accessControl.core.page.Page;
-//import com.casic.accessControl.sys.domain.SysLogInfo;
-//import com.casic.accessControl.sys.dto.ExcelInfoDTO;
-//import com.casic.accessControl.sys.dto.SysLogInfoDTO;
-//import com.casic.accessControl.util.*;
-//import com.casic.accessControl.xls.ExportExcel;
-//import org.hibernate.Criteria;
-//import org.hibernate.criterion.Order;
-//import org.hibernate.criterion.Restrictions;
-//import org.springframework.stereotype.Service;
-//
-//import java.io.FileOutputStream;
-//import java.io.IOException;
-//import java.io.OutputStream;
-//import java.text.ParseException;
-//import java.util.*;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Service
-//public class SysLogInfoManager extends HibernateEntityDao<SysLogInfo> {
-//
-//    public Criteria getCriteria() {
-//        return getSession().createCriteria(SysLogInfo.class);
-//    }
-//
-//    public DataTable<SysLogInfoDTO> pageQueryLogInfoDTO(String jsonParam, String logType, String beginDay, String endDay) throws ParseException {
-//        DataTableParameter dataTableParam = DataTableUtils.getDataTableParameterByJsonParam(jsonParam);
-//
-//        int start = dataTableParam.getiDisplayStart();
-//        int pageSize = dataTableParam.getiDisplayLength();
-//        int pageNo = (start / pageSize) + 1;
-//
-//        Criteria criteria = getCriteria();
-//        criteria.addOrder(Order.desc("id"));
-//
-//        if (StringUtils.isNotBlank(logType)) {
-//            criteria.add(Restrictions.like("logType", "%" + logType + "%"));
-//        }
-//        if (StringUtils.isNotBlank(beginDay)) {
-//            criteria.add(Restrictions.ge("logDay", DateUtils.sdf1.parse(beginDay)));
-//        }
-//        if (StringUtils.isNotBlank(endDay)) {
-//            Date date = DateUtils.sdf1.parse(endDay);
-//            Calendar calendar = Calendar.getInstance();
-//            calendar.setTime(date);
-//            calendar.add(Calendar.DATE, 1);
-//            criteria.add(Restrictions.le("logDay", calendar.getTime()));
-//        }
-//
-//        Page page = pagedQuery(criteria, pageNo, pageSize);
-//
-//        List<SysLogInfoDTO> dtoList = SysLogInfoDTO.ConvertToDTO((List<SysLogInfo>) page.getResult());
-//        DataTable<SysLogInfoDTO> dt = new DataTable<SysLogInfoDTO>();
-//        dt.setAaData(dtoList);
-//        dt.setiTotalDisplayRecords((int) page.getTotalCount());
-//        dt.setsEcho(dataTableParam.getsEcho());
-//        dt.setiTotalRecords((int) page.getTotalCount());
-//        return dt;
-//    }
-//
-//    public SysLogInfoDTO getDTO(Long id) {
-//        return SysLogInfoDTO.ConvertToDTO(get(id));
-//    }
-//
-//    public Map<String, Object> expSysLogToExcel(String logType, String beginDay, String endDay, String path) throws ParseException, IOException {
-//        Map<String, Object> map = new HashMap<String, Object>();
-//        Criteria criteria = getCriteria();
-//        criteria.add(Restrictions.like("logType", "%" + logType + "%"));
-//        if (StringUtils.isNotBlank(beginDay)) {
-//            criteria.add(Restrictions.ge("logDay", DateUtils.sdf1.parse(beginDay)));
-//        }
-//        if (StringUtils.isNotBlank(endDay)) {
-//            Calendar calendar = Calendar.getInstance();
-//            calendar.setTime(DateUtils.sdf1.parse(endDay));
-//            calendar.add(Calendar.DATE, 1);
-//            criteria.add(Restrictions.le("logDay", calendar.getTime()));
-//        }
-//        List<ExcelInfoDTO> dtoList = ExcelInfoDTO.ConvertToDTO(criteria.list());
-//        String[] headers = {"日志类型", "日志内容", "日期", "操作人"};
-//        OutputStream out = new FileOutputStream(path);
-//        ExportExcel<ExcelInfoDTO> ex = new ExportExcel<ExcelInfoDTO>();
-//        ex.exportExcel(headers, dtoList, out);
-//        map.put("success", true);
-//        return map;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/web/OrclInfoController.java b/src/main/java/com/casic/accessControl/sys/web/OrclInfoController.java
deleted file mode 100644
index 22fa833..0000000
--- a/src/main/java/com/casic/accessControl/sys/web/OrclInfoController.java
+++ /dev/null
@@ -1,96 +0,0 @@
-//package com.casic.accessControl.sys.web;
-//
-//import com.casic.accessControl.core.mapper.JsonMapper;
-//import com.casic.accessControl.sys.dto.OrclInfoDTO;
-//import com.casic.accessControl.sys.dto.SysLogInfoDTO;
-//import com.casic.accessControl.sys.manager.OrclInfoManager;
-//import com.casic.accessControl.util.DataBaseUtils;
-//import com.casic.accessControl.util.DataTable;
-//import com.casic.accessControl.util.DateUtils;
-//import com.casic.accessControl.util.StringUtils;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//
-//import javax.annotation.Resource;
-//import javax.persistence.ManyToOne;
-//import javax.servlet.http.HttpServletRequest;
-//import javax.servlet.http.HttpServletResponse;
-//import javax.servlet.http.HttpSession;
-//import java.util.Date;
-//import java.util.HashMap;
-//import java.util.Map;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Controller
-//@RequestMapping("sys")
-//public class OrclInfoController {
-//
-//    @Resource
-//    private OrclInfoManager orclInfoManager;
-//
-//    public void setOrclInfoManager(OrclInfoManager orclInfoManager) {
-//        this.orclInfoManager = orclInfoManager;
-//    }
-//
-//    @RequestMapping("orcl-info-list")
-//    public void listOrcl(String jsonParam,
-//                         @RequestParam(value = "beginDay", required = false) String beginDay,
-//                         @RequestParam(value = "endDay", required = false) String endDay,
-//                         HttpServletResponse response) {
-//        try {
-//            DataTable<OrclInfoDTO> dt = orclInfoManager.pageQueryOrclInfoDTO(jsonParam, beginDay, endDay);
-//            String json = new JsonMapper().toJson(dt);
-//            response.setCharacterEncoding("utf-8");
-//            response.getWriter().write(json);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//    }
-//
-//    @RequestMapping("orcl-info-save")
-//    @ResponseBody
-//    public Map<String, Object> saveOrcl(String memo, HttpServletRequest request) {
-//        Map<String, Object> map = new HashMap<String, Object>();
-//        try {
-//            String path = request.getSession().getServletContext().getRealPath("content\\dmp");
-//            map = orclInfoManager.backupDB(memo, path);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            map.put("success", false);
-//            map.put("message", "数据备份失败！");
-//        }
-//        return map;
-//    }
-//
-//    @RequestMapping("orcl-info-restore")
-//    @ResponseBody
-//    public Map<String, Object> restoreData(@RequestParam(value = "id", required = true) Long id) {
-//        Map<String, Object> map = new HashMap<String, Object>();
-//        try {
-//            orclInfoManager.doImp(id);
-//            map.put("success", true);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            map.put("success", false);
-//        }
-//        return map;
-//    }
-//
-//    @RequestMapping("orcl-info-delete")
-//    @ResponseBody
-//    public Map<String, Object> deleteOrclInfo(@RequestParam(value = "id", required = true) Long id) {
-//        Map<String, Object> map = new HashMap<String, Object>();
-//        try {
-//            orclInfoManager.deleteDTO(id);
-//            map.put("success", true);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            map.put("success", false);
-//        }
-//        return map;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/web/SysLogInfoController.java b/src/main/java/com/casic/accessControl/sys/web/SysLogInfoController.java
deleted file mode 100644
index 86caa76..0000000
--- a/src/main/java/com/casic/accessControl/sys/web/SysLogInfoController.java
+++ /dev/null
@@ -1,81 +0,0 @@
-//package com.casic.accessControl.sys.web;
-//
-//import com.casic.accessControl.core.ext.mail.MailConsumer;
-//import com.casic.accessControl.core.mapper.JsonMapper;
-//import com.casic.accessControl.sys.domain.SysLogInfo;
-//import com.casic.accessControl.sys.dto.SysLogInfoDTO;
-//import com.casic.accessControl.sys.manager.SysLogInfoManager;
-//import com.casic.accessControl.util.DataTable;
-//import com.casic.accessControl.xls.ExportExcel;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.ui.Model;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//
-//import javax.annotation.Resource;
-//import javax.servlet.http.HttpServletRequest;
-//import javax.servlet.http.HttpServletResponse;
-//import java.io.*;
-//import java.util.ArrayList;
-//import java.util.HashMap;
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Controller
-//@RequestMapping("sys")
-//public class SysLogInfoController {
-//
-//    @Resource
-//    private SysLogInfoManager sysLogInfoManager;
-//
-//    public void setSysLogInfoManager(SysLogInfoManager sysLogInfoManager) {
-//        this.sysLogInfoManager = sysLogInfoManager;
-//    }
-//
-//    @RequestMapping("log-info-list")
-//    public void list(String jsonParam
-//            , @RequestParam(value = "logType", required = false) String logType
-//            , @RequestParam(value = "beginDay", required = false) String beginDay
-//            , @RequestParam(value = "endDay", required = false) String endDay
-//            , HttpServletResponse response) {
-//        try {
-//            DataTable<SysLogInfoDTO> dt = sysLogInfoManager.pageQueryLogInfoDTO(jsonParam, logType, beginDay, endDay);
-//            String json = new JsonMapper().toJson(dt);
-//            response.setCharacterEncoding("utf-8");
-//            response.getWriter().write(json);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//    }
-//
-//    @RequestMapping("sys-log-msg")
-//    public String logMsg(@RequestParam(value = "id", required = true) Long id, Model model) {
-//        SysLogInfoDTO dto = sysLogInfoManager.getDTO(id);
-//        model.addAttribute("model", dto);
-//        return "sys/sys-log-msg";
-//    }
-//
-//    @RequestMapping("exp-sys-log")
-//    @ResponseBody
-//    public Map<String, Object> expSysLog(@RequestParam(value = "logType", required = false) String logType,
-//                                         @RequestParam(value = "beginDay", required = false) String beginDay,
-//                                         @RequestParam(value = "endDay", required = false) String endDay,
-//                                         HttpServletResponse response,
-//                                         HttpServletRequest request) throws IOException {
-//        Map<String, Object> map = null;
-//        try {
-//            String path = request.getSession().getServletContext().getRealPath("/") + "\\content\\xls\\log.xls";
-//            map = sysLogInfoManager.expSysLogToExcel(logType, beginDay, endDay, path);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            map = new HashMap<String, Object>();
-//            map.put("success", false);
-//            map.put("message", "Excel文件生成失败！");
-//        }
-//        return map;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/task/web/TaskController.java b/src/main/java/com/casic/accessControl/task/web/TaskController.java
index db515b4..ce1e67c 100644
--- a/src/main/java/com/casic/accessControl/task/web/TaskController.java
+++ b/src/main/java/com/casic/accessControl/task/web/TaskController.java
@@ -1,7 +1,5 @@
 package com.casic.accessControl.task.web;
 
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.manager.MarkerManager;
@@ -56,8 +54,8 @@
     @Resource
     private RoleManager roleManager;
 
-    @Resource
-    private FeatureManager featureManager;
+//    @Resource
+//    private FeatureManager featureManager;
 
     @RequestMapping("task-info-list")
     public void list(@RequestParam(required = true) String jsonParam, @RequestParam(required = false) Integer status, @RequestParam(required = false) String startDate, @RequestParam(required = false) String endDate, HttpServletResponse response, HttpSession session) {
@@ -149,9 +147,7 @@
 
     @RequestMapping("task-Save")
     @ResponseBody
-    public Map<String, Object> saveTask(@RequestParam(value = "areaId", required = true) String areaId,
-                                        @RequestParam(value = "lineId", required = true) String lineId,
-                                        @RequestParam(value = "markers", required = true) String markerIds,
+    public Map<String, Object> saveTask(@RequestParam(value = "markers", required = true) String markerIds,
                                         @RequestParam(value = "patrolerId", required = true) String patrolerId,
                                         @RequestParam(value = "description", required = true) String description,
                                         HttpSession session) {
@@ -166,21 +162,22 @@
             Task task = new Task();
             User patroler = userManager.get(Long.parseLong(patrolerId));
             List<Marker> markers = new ArrayList<Marker>();
-            if (areaId.equalsIgnoreCase(""))//绘制工单
-            {
-                markers = markerManager.getMarkerByIds(markerIds);
-            } else//按区域下发工单
-            {
-                Feature feature = null;
-                Feature line = null;
-                if (StringUtils.isNotBlank(areaId)) {
-                    feature = featureManager.get(Long.parseLong(areaId));
-                }
-                if (StringUtils.isNotBlank(lineId)) {
-                    line = featureManager.get(Long.valueOf(lineId));
-                }
-                markers = markerManager.getMarkerByFeature(feature, line);
-            }
+//            if (areaId.equalsIgnoreCase(""))//绘制工单
+//            {
+//                markers = markerManager.getMarkerByIds(markerIds);
+//            } else//按区域下发工单
+//            {
+//                Feature feature = null;
+//                Feature line = null;
+//                if (StringUtils.isNotBlank(areaId)) {
+//                    feature = featureManager.get(Long.parseLong(areaId));
+//                }
+//                if (StringUtils.isNotBlank(lineId)) {
+//                    line = featureManager.get(Long.valueOf(lineId));
+//                }
+//                markers = markerManager.getMarkerByFeature(feature, line);
+//            }
+            markers = markerManager.getMarkerByIds(markerIds);
             if (markers == null || markers.size() == 0) {
                 map.put("success", false);
                 map.put("message", "未包含标识点！");
diff --git a/src/main/java/com/casic/accessControl/xls/ReadColumnFromExcel.java b/src/main/java/com/casic/accessControl/xls/ReadColumnFromExcel.java
deleted file mode 100644
index ead76c7..0000000
--- a/src/main/java/com/casic/accessControl/xls/ReadColumnFromExcel.java
+++ /dev/null
@@ -1,220 +0,0 @@
-//package com.casic.accessControl.xls;
-//
-//import com.casic.accessControl.shp.dto.MetaInfoDTO;
-//import org.apache.poi.hssf.usermodel.HSSFCell;
-//import org.apache.poi.hssf.usermodel.HSSFRow;
-//import org.apache.poi.hssf.usermodel.HSSFSheet;
-//import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-//import org.apache.poi.xssf.usermodel.XSSFCell;
-//import org.apache.poi.xssf.usermodel.XSSFRow;
-//import org.apache.poi.xssf.usermodel.XSSFSheet;
-//import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-//
-//import java.io.FileInputStream;
-//import java.io.IOException;
-//import java.io.InputStream;
-//import java.util.ArrayList;
-//import java.util.HashMap;
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * Created by Administrator on 2015/9/1.
-// */
-//public class ReadColumnFromExcel {
-//
-//    public static List<List<MetaInfoDTO>> readExcel(String path, Map<String, MetaInfoDTO> map) throws IOException {
-//        if (path == null || Common.EMPTY.equals(path)) {
-//            return null;
-//        } else {
-//            String postfix = Util.getPostfix(path);
-//            if (!Common.EMPTY.equals(postfix)) {
-//                if (Common.OFFICE_EXCEL_2003_POSTFIX.equals(postfix)) {
-//                    return readXls(path,map);
-//                } else if (Common.OFFICE_EXCEL_2010_POSTFIX.equals(postfix)) {
-//                    return readXlsx(path,map);
-//                }
-//            } else {
-//                System.out.println(path + Common.NOT_EXCEL_FILE);
-//            }
-//        }
-//        return new ArrayList<List<MetaInfoDTO>>();
-//    }
-//
-//    public static Map<String,Object> CheckColumnExcel(String path) throws  IOException{
-//        Map<String,Object> map = new HashMap<String, Object>();
-//        if (path == null || Common.EMPTY.equals(path)) {
-//            map.put("success",false);
-//            map.put("message","文件路径不能为空！");
-//        } else {
-//            String postfix = Util.getPostfix(path);
-//            if (!Common.EMPTY.equals(postfix)) {
-//                if (Common.OFFICE_EXCEL_2003_POSTFIX.equals(postfix)) {
-//                    map = CheckXls(path);
-//                } else if (Common.OFFICE_EXCEL_2010_POSTFIX.equals(postfix)) {
-//                    map = CheckXlsx(path);
-//                }
-//            } else {
-//                map.put("success",false);
-//                map.put("message",path + Common.NOT_EXCEL_FILE);
-//            }
-//        }
-//        return map;
-//    }
-//
-//    public static Map<String,Object> CheckXlsx(String path) {
-//        Map<String,Object> map = new HashMap<String, Object>();
-//        return map;
-//    }
-//
-//    public static Map<String, Object> CheckXls(String path) {
-//        Map<String,Object> map = new HashMap<String, Object>();
-//        return map;
-//    }
-//
-//
-//    /**
-//     * Read the Excel 2010
-//     *
-//     * @param path the path of the excel file
-//     * @param map
-//     * @return
-//     * @throws IOException
-//     */
-//    public static List<List<MetaInfoDTO>> readXlsx(String path, Map<String, MetaInfoDTO> map) throws IOException {
-//        System.out.println(Common.PROCESSING + path);
-//        InputStream is = new FileInputStream(path);
-//        XSSFWorkbook xssfWorkbook = new XSSFWorkbook(is);
-//
-//
-//        XSSFSheet xssfSheet = xssfWorkbook.getSheetAt(0);
-//        if (xssfSheet == null ) {
-//            return new ArrayList<List<MetaInfoDTO>>();
-//        }
-//
-//        //获取标题栏信息
-//        XSSFRow xssfRow = xssfSheet.getRow(0);
-//        List<String> headers = new ArrayList<String>();
-//        if (xssfRow != null) {
-//            for (int colNum = xssfRow.getFirstCellNum(); colNum < xssfRow.getLastCellNum(); colNum++) {
-//                XSSFCell cell = xssfRow.getCell(colNum);
-//                if (cell != null) {
-//                    headers.add(cell.getStringCellValue());
-//                }else {
-//                    break;
-//                }
-//            }
-//        }
-//
-//        List<List<MetaInfoDTO>> tbl = new ArrayList<List<MetaInfoDTO>>();
-//        for (int rowNum = 1; rowNum <= xssfSheet.getLastRowNum(); rowNum++) {
-//            xssfRow = xssfSheet.getRow(rowNum);
-//            if (xssfRow != null) {
-//                List<MetaInfoDTO> list = new ArrayList<MetaInfoDTO>();
-//                for (int colNum = xssfRow.getFirstCellNum(); colNum < xssfRow.getLastCellNum(); colNum++) {
-//                    XSSFCell cell = xssfRow.getCell(colNum);
-//                    if (cell != null) {
-//                        MetaInfoDTO dto = getValue(cell,map.get(headers.get(colNum)));
-//                        if(null!=dto){
-//                            list.add(dto);
-//                        }
-//                    }else {
-//                        break;
-//                    }
-//                }
-//
-//                tbl.add(list);
-//            }
-//        }
-//        return tbl;
-//    }
-//
-//    /**
-//     * Read the Excel 2003-2007
-//     *
-//     * @param path the path of the Excel
-//     * @param map
-//     * @return
-//     * @throws IOException
-//     */
-//    public static List<List<MetaInfoDTO>> readXls(String path, Map<String, MetaInfoDTO> map) throws IOException {
-//        System.out.println(Common.PROCESSING + path);
-//        InputStream is = new FileInputStream(path);
-//        HSSFWorkbook hssfWorkbook = new HSSFWorkbook(is);
-//
-//        // Read the Sheet
-//        HSSFSheet hssfSheet = hssfWorkbook.getSheetAt(0);
-//        if (hssfSheet == null ) {
-//            return new ArrayList<List<MetaInfoDTO>>();
-//        }
-//
-//        //获取标题栏信息
-//        HSSFRow hssfRow = hssfSheet.getRow(0);
-//        List<String> headers = new ArrayList<String>();
-//        if (hssfRow != null) {
-//            for (int colNum = hssfRow.getFirstCellNum(); colNum < hssfRow.getLastCellNum(); colNum++) {
-//                HSSFCell cell = hssfRow.getCell(colNum);
-//                if (cell != null) {
-//                    headers.add(cell.getStringCellValue());
-//                }else {
-//                    break;
-//                }
-//            }
-//        }
-//
-//        List<List<MetaInfoDTO>> tbl = new ArrayList<List<MetaInfoDTO>>();
-//        for (int rowNum = 1; rowNum <= hssfSheet.getLastRowNum(); rowNum++) {
-//            hssfRow = hssfSheet.getRow(rowNum);
-//            if (hssfRow != null) {
-//                List<MetaInfoDTO> list = new ArrayList<MetaInfoDTO>();
-//                for (int colNum = hssfRow.getFirstCellNum(); colNum < hssfRow.getLastCellNum(); colNum++) {
-//                    HSSFCell cell = hssfRow.getCell(colNum);
-//                    if (cell != null) {
-//                        MetaInfoDTO dto = getValue(cell, map.get(headers.get(colNum)));
-//                        if(null!=dto){
-//                            list.add(dto);
-//                        }
-//                    }else {
-//                        break;
-//                    }
-//                }
-//
-//                tbl.add(list);
-//            }
-//        }
-//
-//        return tbl;
-//    }
-//
-//    @SuppressWarnings("static-access")
-//    public static MetaInfoDTO getValue(XSSFCell xssfCell,MetaInfoDTO dto) {
-//        if(dto!=null){
-//            MetaInfoDTO t = new MetaInfoDTO();
-//            t.setLayerName(dto.getMetaName());
-//            t.setName(dto.getMetaName());
-//            t.setWidth(dto.getWidth());
-//            t.setType(dto.getType());
-//            t.setCount(dto.getCount());
-//            t.setIsNull(dto.getIsNull());
-//            t.setText(xssfCell.getStringCellValue());
-//            return t;
-//        }
-//        return null;
-//    }
-//
-//    @SuppressWarnings("static-access")
-//    public static MetaInfoDTO getValue(HSSFCell  hssfCell,MetaInfoDTO dto) {
-//        if(dto!=null){
-//            MetaInfoDTO t = new MetaInfoDTO();
-//            t.setName(dto.getMetaName());
-//            t.setLayerName(dto.getMetaName());
-//            t.setWidth(dto.getWidth());
-//            t.setType(dto.getType());
-//            t.setIsNull(dto.getIsNull());
-//            t.setCount(dto.getCount());
-//            t.setText(hssfCell.getStringCellValue());
-//            return t;
-//        }
-//        return null;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/xls/ReadUserInfoFromExcel.java b/src/main/java/com/casic/accessControl/xls/ReadUserInfoFromExcel.java
deleted file mode 100644
index 0625858..0000000
--- a/src/main/java/com/casic/accessControl/xls/ReadUserInfoFromExcel.java
+++ /dev/null
@@ -1,155 +0,0 @@
-//package com.casic.accessControl.xls;
-//
-//import com.casic.accessControl.org.dto.UserInfoDTO;
-//import com.casic.accessControl.shp.dto.MetaInfoDTO;
-//import com.casic.accessControl.util.StringUtils;
-//import org.apache.poi.hssf.usermodel.HSSFCell;
-//import org.apache.poi.hssf.usermodel.HSSFRow;
-//import org.apache.poi.hssf.usermodel.HSSFSheet;
-//import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-//import org.apache.poi.xssf.usermodel.XSSFCell;
-//import org.apache.poi.xssf.usermodel.XSSFRow;
-//import org.apache.poi.xssf.usermodel.XSSFSheet;
-//import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-//
-//import java.io.FileInputStream;
-//import java.io.IOException;
-//import java.io.InputStream;
-//import java.util.ArrayList;
-//import java.util.HashMap;
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * Created by test203 on 2015/12/24.
-// */
-//public class ReadUserInfoFromExcel {
-//
-//    public static List<UserInfoDTO> readExcel(String path) throws IOException {
-//        if (path == null || Common.EMPTY.equals(path)) {
-//            return null;
-//        } else {
-//            String postfix = Util.getPostfix(path);
-//            if (!Common.EMPTY.equals(postfix)) {
-//                if (Common.OFFICE_EXCEL_2003_POSTFIX.equals(postfix)) {
-//                    return readXls(path);
-//                } else if (Common.OFFICE_EXCEL_2010_POSTFIX.equals(postfix)) {
-//                    return readXlsx(path);
-//                }
-//            } else {
-//                System.out.println(path + Common.NOT_EXCEL_FILE);
-//            }
-//        }
-//        return new ArrayList<UserInfoDTO>();
-//    }
-//
-//    public static Map<String,Object> CheckColumnExcel(String path) throws  IOException{
-//        Map<String,Object> map = new HashMap<String, Object>();
-//        if (path == null || Common.EMPTY.equals(path)) {
-//            map.put("success",false);
-//            map.put("message","文件路径不能为空！");
-//        } else {
-//            String postfix = Util.getPostfix(path);
-//            if (!Common.EMPTY.equals(postfix)) {
-//                if (Common.OFFICE_EXCEL_2003_POSTFIX.equals(postfix)) {
-//                    map = CheckXls(path);
-//                } else if (Common.OFFICE_EXCEL_2010_POSTFIX.equals(postfix)) {
-//                    map = CheckXlsx(path);
-//                }
-//            } else {
-//                map.put("success",false);
-//                map.put("message",path + Common.NOT_EXCEL_FILE);
-//            }
-//        }
-//        return map;
-//    }
-//
-//    public static Map<String,Object> CheckXlsx(String path) {
-//        Map<String,Object> map = new HashMap<String, Object>();
-//        return map;
-//    }
-//
-//    public static Map<String, Object> CheckXls(String path) {
-//        Map<String,Object> map = new HashMap<String, Object>();
-//        return map;
-//    }
-//
-//
-//    /**
-//     * Read the Excel 2010
-//     *
-//     * @param path the path of the excel file
-//     * @return
-//     * @throws IOException
-//     */
-//    public static List<UserInfoDTO> readXlsx(String path) throws IOException {
-//        System.out.println(Common.PROCESSING + path);
-//        InputStream is = new FileInputStream(path);
-//        XSSFWorkbook xssfWorkbook = new XSSFWorkbook(is);
-//
-//
-//        XSSFSheet xssfSheet = xssfWorkbook.getSheetAt(0);
-//        if (xssfSheet == null ) {
-//            return new ArrayList<UserInfoDTO>();
-//        }
-//
-//        XSSFRow xssfRow = xssfSheet.getRow(0);
-//        List<UserInfoDTO> list = new ArrayList<UserInfoDTO>();
-//        for (int rowNum = 1; rowNum <= xssfSheet.getLastRowNum(); rowNum++) {
-//            xssfRow = xssfSheet.getRow(rowNum);
-//            if (xssfRow != null) {
-//                if(!StringUtils.isNotBlank(xssfRow.getCell(0).getStringCellValue())){
-//                   break;
-//                }
-//                UserInfoDTO dto = new UserInfoDTO();
-//                dto.setUsername(xssfRow.getCell(0).getStringCellValue());
-//                dto.setTel(xssfRow.getCell(1).getStringCellValue());
-//                dto.setAddress(xssfRow.getCell(2).getStringCellValue());
-//                dto.setDescn(xssfRow.getCell(3).getStringCellValue());
-//                dto.setPassed(false);
-//                dto.setPassword("111111");
-//                list.add(dto);
-//            }
-//        }
-//        return list;
-//    }
-//
-//    /**
-//     * Read the Excel 2003-2007
-//     *
-//     * @param path the path of the Excel
-//     * @return
-//     * @throws IOException
-//     */
-//    public static List<UserInfoDTO> readXls(String path) throws IOException {
-//        System.out.println(Common.PROCESSING + path);
-//        InputStream is = new FileInputStream(path);
-//        HSSFWorkbook hssfWorkbook = new HSSFWorkbook(is);
-//
-//        // Read the Sheet
-//        HSSFSheet hssfSheet = hssfWorkbook.getSheetAt(0);
-//        if (hssfSheet == null ) {
-//            return new ArrayList<UserInfoDTO>();
-//        }
-//
-//        HSSFRow hssfRow = hssfSheet.getRow(0);
-//        List<UserInfoDTO> list = new ArrayList<UserInfoDTO>();
-//        for (int rowNum = 1; rowNum <= hssfSheet.getLastRowNum(); rowNum++) {
-//            hssfRow = hssfSheet.getRow(rowNum);
-//            if (hssfRow != null) {
-//                if(!StringUtils.isNotBlank(hssfRow.getCell(0).getStringCellValue())){
-//                    break;
-//                }
-//                UserInfoDTO dto = new UserInfoDTO();
-//                dto.setUsername(hssfRow.getCell(0).getStringCellValue());
-//                dto.setPassword("111111");
-//                dto.setPassed(false);
-//                dto.setTel(hssfRow.getCell(1).getStringCellValue());
-//                dto.setAddress(hssfRow.getCell(2).getStringCellValue());
-//                dto.setDescn(hssfRow.getCell(3).getStringCellValue());
-//                list.add(dto);
-//            }
-//        }
-//        return list;
-//    }
-//}

diff --git a/src/main/java/com/casic/accessControl/feature/domain/Feature.java b/src/main/java/com/casic/accessControl/feature/domain/Feature.java
deleted file mode 100644
index c89a0c2..0000000
--- a/src/main/java/com/casic/accessControl/feature/domain/Feature.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.casic.accessControl.feature.domain;
-
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-
-import javax.persistence.*;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-//点的信息
-@Entity
-@Table(name = "feature")
-public class Feature {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private Long id;
-    @Column(name = "longitude")
-    private Double longitude;
-    @Column(name = "latitude")
-    private Double latitude;
-    @Column(name = "featureName")
-    private String featureName;
-    @Column(name = "type")
-    private int type;
-    @Column(name = "isValid")
-    private Integer isValid;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "parent")
-    private Feature parent;
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "parent")
-    private List<Feature> children;
-    @Column(name = "memo")
-    private String memo;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "owner", referencedColumnName = "id")
-    private User owner;
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "company", referencedColumnName = "id")
-    private Company company;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer isValid() {
-        return isValid;
-    }
-
-    public void setValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public Feature getParent() {
-        return parent;
-    }
-
-    public void setParent(Feature parent) {
-        this.parent = parent;
-    }
-
-    public List<Feature> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<Feature> children) {
-        this.children = children;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public User getOwner() {
-        return owner;
-    }
-
-    public void setOwner(User owner) {
-        this.owner = owner;
-    }
-
-    public Company getCompany() {
-        return company;
-    }
-
-    public void setCompany(Company company) {
-        this.company = company;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java b/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
deleted file mode 100644
index 256f261..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/FeatureDto.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import com.casic.accessControl.feature.domain.Feature;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/17.
- */
-public class FeatureDto {
-    private Long id;
-    private Double longitude;
-    private Double latitude;
-    private String featureName;
-    private int type;
-    private Integer isValid;
-    private String memo;
-    private Long parentId;
-
-    private String btnEdit = "<a href='#' class='btn mini blue'><i class='icon-edit'></i>编辑</a>";
-    private String btnDelete = "<a href='#' class='btn mini red'><i class='icon-trash'></i>删除</a>";
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getFeatureName() {
-        return featureName;
-    }
-
-    public void setFeatureName(String featureName) {
-        this.featureName = featureName;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public Integer getIsValid() {
-        return isValid;
-    }
-
-    public void setIsValid(Integer isValid) {
-        this.isValid = isValid;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public Long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getBtnEdit() {
-        return btnEdit;
-    }
-
-    public void setBtnEdit(String btnEdit) {
-        this.btnEdit = btnEdit;
-    }
-
-    public String getBtnDelete() {
-        return btnDelete;
-    }
-
-    public void setBtnDelete(String btnDelete) {
-        this.btnDelete = btnDelete;
-    }
-
-    public static FeatureDto convert2FeatureDto(Feature feature) {
-        if (feature == null) {
-            return null;
-        }
-        FeatureDto featureDto = new FeatureDto();
-        featureDto.setId(feature.getId());
-        featureDto.setFeatureName(feature.getFeatureName());
-        featureDto.setIsValid(feature.isValid());
-        featureDto.setLatitude(feature.getLatitude());
-        featureDto.setLongitude(feature.getLongitude());
-        featureDto.setMemo(feature.getMemo());
-        featureDto.setType(feature.getType());
-        if (feature.getParent() != null)
-            featureDto.setParentId(feature.getParent().getId());
-        return featureDto;
-    }
-
-    public static List<FeatureDto> convert2FeatureDtos(List<Feature> features) {
-        List<FeatureDto> featureDtos = new ArrayList<FeatureDto>();
-        for (Feature feature : features) {
-            featureDtos.add(convert2FeatureDto(feature));
-        }
-        return featureDtos;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java b/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
deleted file mode 100644
index 785dcba..0000000
--- a/src/main/java/com/casic/accessControl/feature/dto/OrgDto.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.casic.accessControl.feature.dto;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/19.
- */
-public class OrgDto {
-    private long id;
-
-    private String name;
-
-    private long parentId;
-
-    private List<OrgDto> children = new ArrayList<OrgDto>();
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(long parentId) {
-        this.parentId = parentId;
-    }
-
-    public List<OrgDto> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<OrgDto> children) {
-        this.children = children;
-    }
-}
diff --git a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java b/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
deleted file mode 100644
index a475e21..0000000
--- a/src/main/java/com/casic/accessControl/feature/manager/FeatureManager.java
+++ /dev/null
@@ -1,316 +0,0 @@
-package com.casic.accessControl.feature.manager;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.core.page.Page;
-import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.marker.manager.MarkerManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.DataTableParameter;
-import com.casic.accessControl.util.DataTableUtils;
-import org.apache.commons.collections.CollectionUtils;
-import org.hibernate.Criteria;
-import org.hibernate.Query;
-import org.hibernate.criterion.Restrictions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.jdbc.object.SqlQuery;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Created by lenovo on 2016/5/16.
- */
-@Service
-public class FeatureManager extends HibernateEntityDao<Feature> {
-
-    private Logger logger = LoggerFactory.getLogger(this.getClass());
-    @Resource
-    private MarkerManager markerManager;
-
-
-    public Feature getFeatureById(Long id) {
-        Feature feature = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("id", id)).add(Restrictions.eq("isValid", 1));
-            feature = (Feature) criteria.list().get(0);
-        } catch (Exception e) {
-            return null;
-        }
-        return feature;
-    }
-
-    public FeatureDto getFeatureDtoById(Long id) {
-        return FeatureDto.convert2FeatureDto(getFeatureById(id));
-    }
-
-    /**
-     * 根据id，软删除某个点或线或片
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param ids 多个id
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public String invalidFeature(String ids) {
-        if (StringUtils.isBlank(ids) || ids.indexOf(")") != -1) {//未传入值，直接返回，防止无效查询,过滤非法请求，防止sql注入
-            return "";
-        }
-        String[] idsArr = ids.split(",");
-        StringBuilder canDeleteIds = new StringBuilder("");
-        StringBuilder cantDeleleIds = new StringBuilder("");
-        //找出能删除的和不能删除的id组合
-        for (String id : idsArr) {
-            Long longId = Long.valueOf(id);
-            if (this.isCanDelete(longId)) {
-                if (canDeleteIds.length() > 0) {
-                    canDeleteIds.append(",");
-                }
-                canDeleteIds.append(id);
-
-            } else {
-                if (cantDeleleIds.length() > 0) {
-                    cantDeleleIds.append(",");
-                }
-                cantDeleleIds.append(id);
-            }
-        }
-
-        String temp1Ids = canDeleteIds.toString();
-        String temp2Ids = cantDeleleIds.toString();
-        if (StringUtils.isNotBlank(temp2Ids)) {//有不能删除的，都不删除
-            return "";
-        }
-        Query query = this.getSession().createQuery("update Feature f set f.isValid = 0 where id in (" + temp1Ids + ")");
-        query.executeUpdate();
-
-        return "success";
-    }
-
-    /**
-     * 判断feature是否可以删除
-     * 删除的时候判断是否有标识器或者子节点挂载在本feature上，如果有，则不能删除
-     *
-     * @param id
-     * @return
-     */
-    private boolean isCanDelete(Long id) {
-        Feature feature = this.getFeatureById(id);
-        if (feature.getParent() == null) {//所有用户共用的根节点不能删除
-            return false;
-        }
-        if (CollectionUtils.isNotEmpty(feature.getChildren())) {
-            for (Feature child : feature.getChildren()) {
-                if (child.isValid() == 1) {
-                    return false;
-                }
-            }
-
-        }
-        List<Marker> markers = markerManager.getMarkerByFeature(feature);
-        if (CollectionUtils.isNotEmpty(markers)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * 将数据库中的feature信息按照参数更新
-     *
-     * @param feature
-     */
-    @CacheEvict(value = "getOrgList", allEntries = true)
-    public void saveOrupdateFeature(Feature feature, User user) {
-        this.getSession().saveOrUpdate(feature);
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param user 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByUser")
-    public List<FeatureDto> getFeaturesByUser(Integer type, User user) {
-        if (user == null) {
-            return Collections.emptyList();
-        }
-        Company company = user.getCompany();
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("type", type));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-        return FeatureDto.convert2FeatureDtos(features);
-    }
-
-    /**
-     * 分页使用，datatable获取相应type的feature某页数据
-     *
-     * @param params
-     * @param user
-     * @return
-     */
-    public DataTable<FeatureDto> getPageFeatureListByTye(String params, Feature parent, User user) {
-        DataTable<FeatureDto> result = new DataTable<FeatureDto>();
-        DataTableParameter parameter = DataTableUtils.getDataTableParameterByJsonParam(params);
-        int start = parameter.getiDisplayStart();
-        int pageSize = parameter.getiDisplayLength();
-        int pageNo = (start / pageSize) + 1;
-        Criteria criteria = this.createCriteria(Feature.class);
-//        if (user.getRole().getType() != CommonEnum.ROLE_TYPE.ADMIN.getType()) {//是管理员，获取该租户下所有类型
-//            criteria.add(Restrictions.eq("owner", user));
-//        }
-        Company company = user.getCompany();
-        criteria.add(Restrictions.eq("company", company)).add(Restrictions.eq("isValid", 1)).add(Restrictions.eq("parent", parent));
-        Page page = pagedQuery(criteria, pageNo, pageSize);
-        List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos((List<Feature>) page.getResult());
-        result.setAaData(featureDtos);
-        result.setiTotalDisplayRecords((int) page.getTotalCount());
-        result.setiTotalRecords((int) page.getTotalCount());
-        result.setsEcho(parameter.getsEcho());
-        return result;
-
-
-    }
-
-    /**
-     * 获取层次结构列表,增加缓存
-     *
-     * @param type
-     * @param company
-     * @return
-     */
-    @Cacheable(value = "getOrgList")
-    public String getOrgList(Integer type, Company company) {
-        List<OrgDto> orgDtos = new ArrayList<OrgDto>();
-        List<Feature> features = this.getRootFeatures(type);
-        for (Feature feature : features) {
-            orgDtos.add(this.getChildrenByParentId(feature.getId(), company));
-        }
-        String jsonStr = null;
-        try {
-            jsonStr = new JsonMapper().toJson(orgDtos);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return jsonStr;
-    }
-
-    //    @Cacheable(value = "getChildrenByParentId", key = "#id")
-    public OrgDto getChildrenByParentId(Long id, Company company) {
-        if (id == null) {
-            return null;
-        }
-        Feature feature = getFeatureById(id);
-        if (feature == null) {
-            return null;
-        }
-        //创建OrgDto节点
-        OrgDto orgDto = new OrgDto();
-        orgDto.setId(id); //保存ID信息
-        orgDto.setName(feature.getFeatureName());
-        if (feature.getParent() != null) {
-            orgDto.setParentId(feature.getParent().getId());
-        }
-        List<Feature> departments = this.getActiveChildrenOrgs(feature, company);
-        for (Feature fea : departments) {
-            orgDto.getChildren().add(this.getChildrenByParentId(fea.getId(), company));
-        }
-        return orgDto;
-    }
-
-    //    @Cacheable(value = "getActiveChildrenOrgs", key = "#department.getId()")
-    private List<Feature> getActiveChildrenOrgs(Feature department, Company company) {
-        List<Feature> features = new ArrayList<Feature>();
-        for (Feature feature : department.getChildren()) {
-            if (feature.isValid() == 1 && feature.getCompany().getId().equals(company.getId())) {
-                features.add(feature);
-            }
-        }
-        return features;
-    }
-
-
-    public List<Feature> getRootFeatures(Integer type) {
-        List<Feature> features = null;
-        try {
-            Criteria criteria = this.getSession().createCriteria(Feature.class);
-            criteria.add(Restrictions.eq("type", type)).add(Restrictions.isNull("parent"));
-            features = criteria.list();
-        } catch (Exception e) {
-            return Collections.emptyList();
-        }
-        return features;
-
-    }
-
-
-    /**
-     * 获取某组织机构下的特定类型Feature列表
-     *
-     * @param company 特定的Feature类型
-     * @return
-     */
-//    @Cacheable(value = "getFeaturesByCompany", key = "#company.getId()")
-    public List<Feature> getFeaturesByCompany(Company company) {
-        Criteria criteria = this.getSession().createCriteria(Feature.class);
-        criteria.add(Restrictions.eq("company", company));
-        criteria.add(Restrictions.eq("isValid", 1));
-        List<Feature> features = criteria.list();
-
-        for (Feature f : features) {
-            f.getChildren().toString();
-            f.getOwner().toString();
-            if (f.getParent() != null)
-                f.getParent().toString();
-        }
-        return features;
-    }
-
-    /**
-     * 根据组织结构的id获取叶子节点
-     ***重要：**已更改为包含本节点****
-     * @param type
-     * @param feature
-     * @return
-     */
-    public List<Feature> getLeafByParentId(Integer type, Feature feature) {
-        if (feature == null || feature.isValid() == 0) return Collections.emptyList();
-        List<Feature> features = new ArrayList<Feature>();
-        if (CollectionUtils.isEmpty(feature.getChildren())) {
-            features.add(feature);
-            return features;
-        }
-        List<Feature> children = feature.getChildren();
-        boolean flag = false;
-        for (Feature child : children) {
-            if (child.isValid() == 1) {
-                flag = true;
-                features.addAll(getLeafByParentId(type, child));
-            }
-        }
-//        if (!flag) {//没有有效的子节点
-            features.add(feature);
-//        }
-        return features;
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java b/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
deleted file mode 100644
index a706a36..0000000
--- a/src/main/java/com/casic/accessControl/feature/web/FeatureController.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package com.casic.accessControl.feature.web;
-
-import com.casic.accessControl.common.CommonEnum;
-import com.casic.accessControl.core.mapper.JsonMapper;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.dto.OrgDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.marker.domain.Marker;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.Role;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.CompanyManager;
-import com.casic.accessControl.user.manager.UserManager;
-import com.casic.accessControl.util.DataTable;
-import com.casic.accessControl.util.StringUtils;
-import com.casic.accessControl.xls.Common;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import sun.org.mozilla.javascript.internal.EcmaError;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.IOException;
-import java.util.*;
-
-/**
- * 提供http访问接口
- * Created by lenovo on 2016/5/16.
- */
-@Controller
-@RequestMapping(value = "feature")
-public class FeatureController {
-    @Autowired
-    private FeatureManager featureManager;
-    @Autowired
-    private UserManager userManager;
-    @Autowired
-    private CompanyManager companyManager;
-
-    @RequestMapping(value = "org-list")
-    @ResponseBody
-    public String getOrgList(@RequestParam(required = true) Integer type, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Company company = user.getCompany();
-        return featureManager.getOrgList(type, company);
-    }
-
-    @RequestMapping(value = "org-list-na")
-    @ResponseBody
-    public Map<String, String> getOrgListNa(@RequestParam Long userId) {//na端所有传过来的userid都是公司id
-        Map<String, String> res = new HashMap<String, String>();
-        res.put("message", "列表获取失败");
-        try {
-//            User user = userManager.getUserById(userId);//获取当前登录用户
-//            Company company = user.getCompany();
-            Company company = companyManager.getCompanyById(userId);
-            String areas = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.AREA.getIndex(), company);
-            String lines = featureManager.getOrgList(CommonEnum.FEATURE_TYPE.LINE.getIndex(), company);
-            res.put("feature", areas);
-            res.put("line", lines);
-        } catch (Exception e) {
-            return res;
-        }
-        res.put("message", "成功获取");
-        return res;
-    }
-
-    @RequestMapping(value = "getFeature")
-    @ResponseBody
-    public Map<String, Object> getFeaturesByUser(@RequestParam(required = true) Integer type, HttpSession session) {
-
-        Map<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        List<FeatureDto> list = featureManager.getFeaturesByUser(type, user);
-        if (list == null) {//获取列表失败
-            result.put("message", "获取列表出现错误");
-            return result;
-        } else {
-            result.put("data", list);
-            result.put("message", "获取列表成功");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "getSubFeatureList")
-    public void getSubFeatureList(@RequestParam(required = true) String jsonParams, @RequestParam(required = false) Long parentId, HttpServletResponse response, HttpSession session) {
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-        Feature parent = featureManager.getFeatureById(parentId);
-        DataTable<FeatureDto> dtoDataTable = featureManager.getPageFeatureListByTye(jsonParams, parent, user);
-        Gson gson = new Gson();
-        String json = gson.toJson(dtoDataTable);
-        response.setCharacterEncoding("utf-8");
-        try {
-            response.getWriter().write(json);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @RequestMapping(value = "delete")
-    @ResponseBody
-    public Map<String, Object> deleteFeatureById(@RequestParam(required = true) Long id, HttpSession session) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        try {
-            String res = featureManager.invalidFeature(id.toString());
-            if (StringUtils.isBlank(res)) {
-                result.put("message", "删除失败");
-            } else {
-                result.put("message", "删除成功");
-                result.put("success", true);
-            }
-        } catch (Exception e) {
-            result.put("message", "删除失败");
-        }
-        return result;
-    }
-
-    @RequestMapping(value = "save")
-    @ResponseBody
-    public Map<String, Object> save(@RequestParam(required = true) String params, HttpSession session) {
-        Gson gson = new Gson();
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        User user = (User) session.getAttribute(StringUtils.SYS_USER);//获取当前登录用户
-
-        Map markers = gson.fromJson(params, HashMap.class);
-        String featureName = (String) markers.get("featureName");
-        String memo = (String) markers.get("memo") == null ? "" : (String) markers.get("memo");
-        Long parentId = Long.valueOf(StringUtils.isBlank((String) markers.get("parentId")) ? "-1" : (String) markers.get("parentId"));//不知为什么转过来为Double
-        Long id = Long.valueOf(StringUtils.isBlank((String) markers.get("id")) ? "-1" : (String) markers.get("id"));
-
-
-        if (StringUtils.isBlank(featureName) || parentId.equals(-1L)) {
-            result.put("message", "必要参数未传送");
-            return result;
-        }
-        Feature feature = new Feature();
-        feature.setValid(1);
-        Feature parent = featureManager.getFeatureById(parentId);
-        feature.setParent(parent);
-        feature.setFeatureName(featureName);
-        feature.setMemo(memo);
-        feature.setOwner(user);
-        feature.setCompany(user.getCompany());
-        feature.setType(parent.getType());
-        if (!id.equals(-1L)) {
-            feature.setId(id);
-        }
-        try {
-            featureManager.saveOrupdateFeature(feature, user);
-            result.put("message", "保存成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "保存失败");
-        }
-        return result;
-
-    }
-
-
-    @RequestMapping(value = "getFeatureById")
-    @ResponseBody
-    public Map<String, Object> getFeatureById(@RequestParam(required = true) Long id) {
-        HashMap<String, Object> result = new HashMap<String, Object>();
-        try {
-            FeatureDto feature = featureManager.getFeatureDtoById(id);
-            result.put("data", feature);
-            result.put("message", "获取成功");
-            result.put("success", true);
-        } catch (Exception e) {
-            result.put("message", "获取失败");
-        }
-        return result;
-
-    }
-
-}
diff --git a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
index 08a290e..3f53635 100644
--- a/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
+++ b/src/main/java/com/casic/accessControl/marker/dto/MarkerDto.java
@@ -1,6 +1,6 @@
 package com.casic.accessControl.marker.dto;
 
-import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.domain.Feature;
 import com.casic.accessControl.marker.domain.Marker;
 import org.apache.commons.collections.CollectionUtils;
 
diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
index 080b291..7fe7434 100644
--- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
+++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java
@@ -4,8 +4,6 @@
 import com.casic.accessControl.core.hibernate.HibernateEntityDao;
 import com.casic.accessControl.core.page.Page;
 import com.casic.accessControl.core.util.StringUtils;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.user.domain.Company;
@@ -49,9 +47,6 @@
 public class MarkerManager extends HibernateEntityDao<Marker> {
 
     @Resource
-    private FeatureManager featureManager;
-
-    @Resource
     private UserManager userInfoManager;
 
 
@@ -154,33 +149,33 @@
 
     //获取marker
 //    @Cacheable(value = "getMarkerByFeature", key = "#feature.getId()")
-    public List<Marker> getMarkerByFeature(Feature feature) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            criteria.add(Restrictions.eq("belongLine", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            criteria.add(Restrictions.eq("belongLine", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
-    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
-        try {
-            Criteria criteria = this.createCriteria(Marker.class);
-            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
-            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
-            criteria.add(Restrictions.eq("isValid", 1));
-
-            List<Marker> markers = criteria.list();
-            return markers;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return Collections.emptyList();
-    }
+//    public List<Marker> getMarkerByFeature(Feature feature, Feature line) {
+//        try {
+//            Criteria criteria = this.createCriteria(Marker.class);
+//            if (line != null) criteria.add(Restrictions.eq("belongLine", line));
+//            if (feature != null) criteria.add(Restrictions.eq("belongFeature", feature));
+//            criteria.add(Restrictions.eq("isValid", 1));
+//
+//            List<Marker> markers = criteria.list();
+//            return markers;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return Collections.emptyList();
+//    }
 
     public boolean saveMarker(Marker marker) {
         try {
@@ -465,7 +460,7 @@
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setLayStyle(sheet.getCell(indexMap.get("layStyle"), i).getContents());
-                } else if(recordTypeFlag == 4) {
+                } else if (recordTypeFlag == 4) {
                     markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents());
                     markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents());
                     markerDto.setBelowType(sheet.getCell(indexMap.get("belowType"), i).getContents());
diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
index a19f2f5..7675e1f 100644
--- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
+++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java
@@ -2,9 +2,6 @@
 
 import com.casic.accessControl.core.ext.export.CsvExportor;
 import com.casic.accessControl.core.ext.export.TableModel;
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.manager.MarkerManager;
diff --git a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java b/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
deleted file mode 100644
index e69de29..0000000
--- a/src/main/java/com/casic/accessControl/rs/AuthorityResource.java
+++ /dev/null
diff --git a/src/main/java/com/casic/accessControl/rs/FeatureResource.java b/src/main/java/com/casic/accessControl/rs/FeatureResource.java
index 68aeb97..e97f18b 100644
--- a/src/main/java/com/casic/accessControl/rs/FeatureResource.java
+++ b/src/main/java/com/casic/accessControl/rs/FeatureResource.java
@@ -1,65 +1,65 @@
-package com.casic.accessControl.rs;
-
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.dto.FeatureDto;
-import com.casic.accessControl.feature.manager.FeatureManager;
-import com.casic.accessControl.user.domain.Company;
-import com.casic.accessControl.user.domain.User;
-import com.casic.accessControl.user.manager.UserManager;
-import com.google.gson.Gson;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import javax.annotation.Resource;
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
-* Created by admin on 2015/1/15.
-*/
-@Component
-@Path("feature")
-public class FeatureResource
-{
-    private static Logger logger = LoggerFactory.getLogger(FeatureResource.class);
-
-    @Resource
-    private UserManager userManager;
-
-    @Resource
-    private FeatureManager featureManager;
-
-    @GET
-    @Path("get")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map get(@QueryParam("userName") String userName ){
-        Map map = new HashMap<String, Object>();
-        try {
-            User user = userManager.getUserByName(userName);
-            if (user == null) {
-                map.put("success", "false");
-                map.put("message", "人员不存在！");
-                return map;
-            }
-            Company company = user.getCompany();
-            if (company!=null)
-            {
-                List<Feature> features = featureManager.getFeaturesByCompany(company);
-                List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos(features);
-                map.put("success", "true");
-                map.put("message", featureDtos);
-            }
-        }
-        catch (Exception e)
-        {
-            map.put("success", "false");
-            map.put("message", e.getMessage());
-        }
-        return  map;
-    }
-}
+//package com.casic.accessControl.rs;
+//
+//import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.dto.FeatureDto;
+//import com.casic.accessControl.feature.manager.FeatureManager;
+//import com.casic.accessControl.user.domain.Company;
+//import com.casic.accessControl.user.domain.User;
+//import com.casic.accessControl.user.manager.UserManager;
+//import com.google.gson.Gson;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.stereotype.Component;
+//import org.springframework.web.bind.annotation.RequestParam;
+//
+//import javax.annotation.Resource;
+//import javax.ws.rs.*;
+//import javax.ws.rs.core.MediaType;
+//import java.util.HashMap;
+//import java.util.List;
+//import java.util.Map;
+//
+///**
+//* Created by admin on 2015/1/15.
+//*/
+//@Component
+//@Path("feature")
+//public class FeatureResource
+//{
+//    private static Logger logger = LoggerFactory.getLogger(FeatureResource.class);
+//
+//    @Resource
+//    private UserManager userManager;
+//
+//    @Resource
+//    private FeatureManager featureManager;
+//
+//    @GET
+//    @Path("get")
+//    @Produces(MediaType.APPLICATION_JSON)
+//    public Map get(@QueryParam("userName") String userName ){
+//        Map map = new HashMap<String, Object>();
+//        try {
+//            User user = userManager.getUserByName(userName);
+//            if (user == null) {
+//                map.put("success", "false");
+//                map.put("message", "人员不存在！");
+//                return map;
+//            }
+//            Company company = user.getCompany();
+//            if (company!=null)
+//            {
+//                List<Feature> features = featureManager.getFeaturesByCompany(company);
+//                List<FeatureDto> featureDtos = FeatureDto.convert2FeatureDtos(features);
+//                map.put("success", "true");
+//                map.put("message", featureDtos);
+//            }
+//        }
+//        catch (Exception e)
+//        {
+//            map.put("success", "false");
+//            map.put("message", e.getMessage());
+//        }
+//        return  map;
+//    }
+//}
diff --git a/src/main/java/com/casic/accessControl/rs/MapInfo.java b/src/main/java/com/casic/accessControl/rs/MapInfo.java
deleted file mode 100644
index a77fce9..0000000
--- a/src/main/java/com/casic/accessControl/rs/MapInfo.java
+++ /dev/null
@@ -1,131 +0,0 @@
-//package com.casic.accessControl.rs;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-///**
-// * Created by admin on 2015/8/26.
-// */
-//public class MapInfo {
-//
-//    private String mapUrl;
-//
-//    private String updateTime;
-//
-//    private String uploader;
-//
-//    private String name;
-//
-//    private String uuid;
-//
-//    private String site;
-//    /*
-//    0:草稿
-//    1：待审核
-//    2：通过
-//    3: 驳回
-//     */
-//    private String status;
-//
-//    //
-//    private int id;
-//
-//
-//    public String getMapUrl()
-//    {
-//        return mapUrl;
-//    }
-//
-//    public void setMapUrl(String mapUrl)
-//    {
-//        this.mapUrl = mapUrl;
-//    }
-//
-//    public String getUpdateTime()
-//    {
-//        return updateTime;
-//    }
-//
-//    public void setUpdateTime(String updateTime)
-//    {
-//        this.updateTime = updateTime;
-//    }
-//
-//    public String getUploader()
-//    {
-//        return uploader;
-//    }
-//
-//    public void setUploader(String uploader)
-//    {
-//        this.uploader = uploader;
-//    }
-//
-//    public String getName()
-//    {
-//        return name;
-//    }
-//
-//    public void setName(String name)
-//    {
-//        this.name = name;
-//    }
-//
-//    public String getUuid()
-//    {
-//        return uuid;
-//    }
-//
-//    public void setUuid(String uuid)
-//    {
-//        this.uuid = uuid;
-//    }
-//
-//    public String getSite()
-//    {
-//        return site;
-//    }
-//
-//    public void setSite(String site)
-//    {
-//        this.site = site;
-//    }
-//
-//    public String getStatus()
-//    {
-//        return status;
-//    }
-//
-//    public void setStatus(String status)
-//    {
-//        this.status = status;
-//    }
-//
-//    public int getId()
-//    {
-//        return id;
-//    }
-//
-//    public void setId(int id)
-//    {
-//        this.id = id;
-//    }
-//
-//    public static List<MapInfo> getMockerMaps()
-//    {
-//        List<MapInfo> maps = new ArrayList<MapInfo>();
-//        for (int i = 0; i < 20; i++)
-//        {
-//            MapInfo map = new MapInfo();
-//            map.setId(i);
-//            map.setUploader("张帆");
-//            map.setMapUrl("http://192.168.0.111:9080/accessControl/logo.jpg");
-//            map.setSite("永旺路"+i);
-//            map.setUpdateTime("2015-08-02");
-//            map.setStatus("待审核");
-//            maps.add(map);
-//        }
-//        return maps;
-//
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/rs/MarkResource.java b/src/main/java/com/casic/accessControl/rs/MarkResource.java
index 8ae4d85..cef1580 100644
--- a/src/main/java/com/casic/accessControl/rs/MarkResource.java
+++ b/src/main/java/com/casic/accessControl/rs/MarkResource.java
@@ -1,7 +1,7 @@
 package com.casic.accessControl.rs;
 
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
+//import com.casic.accessControl.feature.domain.Feature;
+//import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.manager.MarkerManager;
 import com.casic.accessControl.user.domain.Company;
@@ -35,8 +35,8 @@
     @Resource
     private MarkerManager markerManager;
 
-    @Resource
-    private FeatureManager featureManager;
+//    @Resource
+//    private FeatureManager featureManager;
 
     @GET
     @Path("post")
diff --git a/src/main/java/com/casic/accessControl/rs/UserObj.java b/src/main/java/com/casic/accessControl/rs/UserObj.java
deleted file mode 100644
index c0fe651..0000000
--- a/src/main/java/com/casic/accessControl/rs/UserObj.java
+++ /dev/null
@@ -1,61 +0,0 @@
-//package com.casic.accessControl.rs;
-//
-//import java.io.Serializable;
-//
-///**
-// * Created by admin on 2015/10/9.
-// */
-//public class UserObj implements Serializable {
-//    private String userName;
-//    private String password;
-//    private String appId;
-//    /*
-//    roles:��ɫ֮���Զ��ŷָ�
-//     */
-//    private String roles;
-//
-//    /*
-//    authorities:Ȩ��֮���Զ��ŷָ�
-//    */
-//    private String authorities;
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public String getPassword() {
-//        return password;
-//    }
-//
-//    public void setPassword(String password) {
-//        this.password = password;
-//    }
-//
-//    public String getAppId() {
-//        return appId;
-//    }
-//
-//    public void setAppId(String appId) {
-//        this.appId = appId;
-//    }
-//
-//    public String getRoles() {
-//        return roles;
-//    }
-//
-//    public void setRoles(String roles) {
-//        this.roles = roles;
-//    }
-//
-//    public String getAuthorities() {
-//        return authorities;
-//    }
-//
-//    public void setAuthorities(String authorities) {
-//        this.authorities = authorities;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java b/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java
deleted file mode 100644
index ac60ed5..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/DataBaseInfo.java
+++ /dev/null
@@ -1,65 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//import org.geotools.referencing.operation.transform.NADCONTransform;
-//
-//import javax.persistence.*;
-//
-///**
-// * Created by test203 on 2015/10/29.
-// */
-//@Entity
-//@Table(name = "ZX_DATABASE_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_DATABASE_INFO_ID", sequenceName = "SEQ_ZX_DATABASE_INFO_ID", allocationSize = 1, initialValue = 1)
-//public class DataBaseInfo {
-//    private Long id;
-//    private String account;
-//    private String password;
-//    private String sid;
-//    private String owner;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_ZX_DATABASE_INFO_ID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "ACCOUNT", nullable = false)
-//    public String getAccount() {
-//        return account;
-//    }
-//
-//    public void setAccount(String account) {
-//        this.account = account;
-//    }
-//
-//    @Column(name = "PASSWORD", nullable = false)
-//    public String getPassword() {
-//        return password;
-//    }
-//
-//    public void setPassword(String password) {
-//        this.password = password;
-//    }
-//
-//    @Column(name = "SID", nullable = false)
-//    public String getSid() {
-//        return sid;
-//    }
-//
-//    public void setSid(String sid) {
-//        this.sid = sid;
-//    }
-//
-//    @Column(name = "OWNER", nullable = false)
-//    public String getOwner() {
-//        return owner;
-//    }
-//
-//    public void setOwner(String owner) {
-//        this.owner = owner;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java b/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java
deleted file mode 100644
index 9578060..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/OrclInfo.java
+++ /dev/null
@@ -1,77 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//import com.casic.accessControl.org.domain.UserInfo;
-//
-//import javax.persistence.*;
-//import java.util.Date;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Entity
-//@Table(name = "ZX_ORCL_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_ORCL_INFO_ID",sequenceName = "SEQ_ZX_ORCL_INFO_ID",allocationSize = 1,initialValue = 1)
-//public class OrclInfo {
-//    private Long id;
-//    private String fileName;
-//    private String filePath;
-//    private String memo;
-//    private Date bkDay = new Date();
-//    private UserInfo userInfo;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE,generator = "SEQ_ZX_ORCL_INFO_ID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "FILE_NAME",nullable = false)
-//    public String getFileName() {
-//        return fileName;
-//    }
-//
-//    public void setFileName(String fileName) {
-//        this.fileName = fileName;
-//    }
-//
-//    @Column(name = "FILE_PATH",nullable = false)
-//    public String getFilePath() {
-//        return filePath;
-//    }
-//
-//    public void setFilePath(String filePath) {
-//        this.filePath = filePath;
-//    }
-//
-//    @Column(name = "MEMO")
-//    public String getMemo() {
-//        return memo;
-//    }
-//
-//    public void setMemo(String memo) {
-//        this.memo = memo;
-//    }
-//
-//    @Column(name = "BK_DAY")
-//    public Date getBkDay() {
-//        return bkDay;
-//    }
-//
-//    public void setBkDay(Date bkDay) {
-//        this.bkDay = bkDay;
-//    }
-//
-//    @ManyToOne(fetch = FetchType.LAZY)
-//    @JoinColumn(name = "USER_ID")
-//    public UserInfo getUserInfo() {
-//        return userInfo;
-//    }
-//
-//    public void setUserInfo(UserInfo userInfo) {
-//        this.userInfo = userInfo;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/domain/SysLogInfo.java b/src/main/java/com/casic/accessControl/sys/domain/SysLogInfo.java
deleted file mode 100644
index 60e5583..0000000
--- a/src/main/java/com/casic/accessControl/sys/domain/SysLogInfo.java
+++ /dev/null
@@ -1,70 +0,0 @@
-//package com.casic.accessControl.sys.domain;
-//
-//
-//import com.casic.accessControl.user.domain.UserInfo;
-//
-//import javax.persistence.*;
-//import java.io.Serializable;
-//import java.util.Date;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Entity
-//@Table(name = "ZX_SYS_LOG_INFO")
-//@SequenceGenerator(name = "SEQ_ZX_SYS_LOG_ID",sequenceName = "SEQ_ZX_SYS_LOG_ID",allocationSize = 1,initialValue = 1)
-//public class SysLogInfo implements Serializable{
-//    private Long id;
-//    private String logType;//系统日志、运行日志、操作日志
-//    private String msg;
-//    private Date logDay = new Date();
-//    private UserInfo user;
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.SEQUENCE,generator = "SEQ_ZX_SYS_LOG_ID")
-//    @Column(name = "DBID")
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    @Column(name = "LOG_TYPE",nullable = false)
-//    public String getLogType() {
-//        return logType;
-//    }
-//
-//    public void setLogType(String logType) {
-//        this.logType = logType;
-//    }
-//
-//    @Column(name = "LOG_MSG",nullable = false)
-//    public String getMsg() {
-//        return msg;
-//    }
-//
-//    public void setMsg(String msg) {
-//        this.msg = msg;
-//    }
-//
-//    @Column(name = "LOG_DAY")
-//    public Date getLogDay() {
-//        return logDay;
-//    }
-//
-//    public void setLogDay(Date logDay) {
-//        this.logDay = logDay;
-//    }
-//
-//    @ManyToOne(fetch = FetchType.LAZY)
-//    @JoinColumn(name = "USER_ID")
-//    public UserInfo getUser() {
-//        return user;
-//    }
-//
-//    public void setUser(UserInfo user) {
-//        this.user = user;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/dto/ExcelInfoDTO.java b/src/main/java/com/casic/accessControl/sys/dto/ExcelInfoDTO.java
deleted file mode 100644
index 2fe496e..0000000
--- a/src/main/java/com/casic/accessControl/sys/dto/ExcelInfoDTO.java
+++ /dev/null
@@ -1,77 +0,0 @@
-//package com.casic.accessControl.sys.dto;
-//
-//import com.casic.accessControl.sys.domain.SysLogInfo;
-//import com.casic.accessControl.util.DateUtils;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-///**
-// * Created by test203 on 2015/10/23.
-// */
-//public class ExcelInfoDTO {
-//    private String logType;//系统日志、运行日志、操作日志
-//    private String msg;
-//    private String logDay;
-//    private String userName;
-//
-//    public String getLogType() {
-//        return logType;
-//    }
-//
-//    public void setLogType(String logType) {
-//        this.logType = logType;
-//    }
-//
-//    public String getMsg() {
-//        return msg;
-//    }
-//
-//    public void setMsg(String msg) {
-//        this.msg = msg;
-//    }
-//
-//    public String getLogDay() {
-//        return logDay;
-//    }
-//
-//    public void setLogDay(String logDay) {
-//        this.logDay = logDay;
-//    }
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public static ExcelInfoDTO ConvertToDTO(SysLogInfo logInfo){
-//        if(null!=logInfo){
-//            ExcelInfoDTO dto = new ExcelInfoDTO();
-//            dto.setLogType(logInfo.getLogType());
-//            if(null!=logInfo.getLogDay()){
-//                dto.setLogDay(DateUtils.sdf2.format(logInfo.getLogDay()));
-//            }else {
-//                dto.setLogDay(" ");
-//            }
-//            dto.setMsg(logInfo.getMsg());
-//            if(null!=logInfo.getUser()){
-//                dto.setUserName(logInfo.getUser().getUserName());
-//            }else {
-//                dto.setUserName(" ");
-//            }
-//            return dto;
-//        }
-//        return new ExcelInfoDTO();
-//    }
-//
-//    public static List<ExcelInfoDTO> ConvertToDTO(List<SysLogInfo> list){
-//        List<ExcelInfoDTO> dtoList = new ArrayList<ExcelInfoDTO>();
-//        for(SysLogInfo log : list){
-//            dtoList.add(ConvertToDTO(log));
-//        }
-//        return dtoList;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/dto/OrclInfoDTO.java b/src/main/java/com/casic/accessControl/sys/dto/OrclInfoDTO.java
deleted file mode 100644
index 46a261d..0000000
--- a/src/main/java/com/casic/accessControl/sys/dto/OrclInfoDTO.java
+++ /dev/null
@@ -1,124 +0,0 @@
-//package com.casic.accessControl.sys.dto;
-//
-//import com.casic.accessControl.org.domain.UserInfo;
-//import com.casic.accessControl.shp.domain.LayerInfo;
-//import com.casic.accessControl.sys.domain.OrclInfo;
-//import com.casic.accessControl.util.DateUtils;
-//
-//import java.util.ArrayList;
-//import java.util.Date;
-//import java.util.List;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//public class OrclInfoDTO {
-//    private Long id;
-//    private String fileName;
-//    private String filePath;
-//    private String memo;
-//    private String bkDay;
-//    private Long userId;
-//    private String userName;
-//    private String btnRestor = "<a href='#' class='btn mini blue'>还原</a>";
-//    private String btnDelete = "<a href='#' class='btn mini red'>删除</a>";
-//
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    public String getFileName() {
-//        return fileName;
-//    }
-//
-//    public void setFileName(String fileName) {
-//        this.fileName = fileName;
-//    }
-//
-//    public String getFilePath() {
-//        return filePath;
-//    }
-//
-//    public void setFilePath(String filePath) {
-//        this.filePath = filePath;
-//    }
-//
-//    public String getMemo() {
-//        return memo;
-//    }
-//
-//    public void setMemo(String memo) {
-//        this.memo = memo;
-//    }
-//
-//    public String getBkDay() {
-//        return bkDay;
-//    }
-//
-//    public void setBkDay(String bkDay) {
-//        this.bkDay = bkDay;
-//    }
-//
-//    public Long getUserId() {
-//        return userId;
-//    }
-//
-//    public void setUserId(Long userId) {
-//        this.userId = userId;
-//    }
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public String getBtnRestor() {
-//        return btnRestor;
-//    }
-//
-//    public void setBtnRestor(String btnRestor) {
-//        this.btnRestor = btnRestor;
-//    }
-//
-//    public String getBtnDelete() {
-//        return btnDelete;
-//    }
-//
-//    public void setBtnDelete(String btnDelete) {
-//        this.btnDelete = btnDelete;
-//    }
-//
-//    public static OrclInfoDTO ConvertToDTO(OrclInfo orcl){
-//        if(null!=orcl){
-//            OrclInfoDTO dto = new OrclInfoDTO();
-//            dto.setId(orcl.getId());
-//            dto.setFileName(orcl.getFileName());
-//            dto.setFilePath(orcl.getFilePath());
-//            dto.setMemo(orcl.getMemo());
-//            if(null!=orcl.getBkDay()){
-//                dto.setBkDay(DateUtils.sdf1.format(orcl.getBkDay()));
-//            }
-//            if(null!=orcl.getUserInfo()){
-//                dto.setUserId(orcl.getUserInfo().getId());
-//                dto.setUserName(orcl.getUserInfo().getUsername());
-//            }
-//            return dto;
-//        }
-//        return new OrclInfoDTO();
-//    }
-//
-//    public static List<OrclInfoDTO> ConvertToDTO(List<OrclInfo> list){
-//        List<OrclInfoDTO> dtoList = new ArrayList<OrclInfoDTO>();
-//        for(OrclInfo orcl : list){
-//            dtoList.add(ConvertToDTO(orcl));
-//        }
-//        return dtoList;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/dto/SysLogInfoDTO.java b/src/main/java/com/casic/accessControl/sys/dto/SysLogInfoDTO.java
deleted file mode 100644
index 64d6c39..0000000
--- a/src/main/java/com/casic/accessControl/sys/dto/SysLogInfoDTO.java
+++ /dev/null
@@ -1,103 +0,0 @@
-//package com.casic.accessControl.sys.dto;
-//
-//import com.casic.accessControl.sys.domain.SysLogInfo;
-//import com.casic.accessControl.util.DateUtils;
-//
-//import java.util.ArrayList;
-//import java.util.Date;
-//import java.util.List;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//public class SysLogInfoDTO {
-//    private Long id;
-//    private String logType;//系统日志、运行日志、操作日志
-//    private String msg;
-//    private String logDay;
-//    private Long userId;
-//    private String userName;
-//    private String btn = "<a href='#' class='btn mini blue'>查看</a>";
-//
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    public String getLogType() {
-//        return logType;
-//    }
-//
-//    public void setLogType(String logType) {
-//        this.logType = logType;
-//    }
-//
-//    public String getMsg() {
-//        return msg;
-//    }
-//
-//    public void setMsg(String msg) {
-//        this.msg = msg;
-//    }
-//
-//    public String getLogDay() {
-//        return logDay;
-//    }
-//
-//    public void setLogDay(String logDay) {
-//        this.logDay = logDay;
-//    }
-//
-//    public Long getUserId() {
-//        return userId;
-//    }
-//
-//    public void setUserId(Long userId) {
-//        this.userId = userId;
-//    }
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public String getBtn() {
-//        return btn;
-//    }
-//
-//    public void setBtn(String btn) {
-//        this.btn = btn;
-//    }
-//
-//    public static SysLogInfoDTO ConvertToDTO(SysLogInfo log){
-//        if(null!=log){
-//            SysLogInfoDTO dto = new SysLogInfoDTO();
-//            dto.setId(log.getId());
-//            dto.setLogType(log.getLogType());
-//            if(null!=log.getLogDay()){
-//                dto.setLogDay(DateUtils.sdf2.format(log.getLogDay()));
-//            }
-//            dto.setMsg(log.getMsg());
-//            if(null!=log.getUser()){
-//                dto.setUserId(log.getUser().getId());
-//                dto.setUserName(log.getUser().getUserName());
-//            }
-//            return dto;
-//        }
-//        return new SysLogInfoDTO();
-//    }
-//
-//    public static List<SysLogInfoDTO> ConvertToDTO(List<SysLogInfo> list){
-//        List<SysLogInfoDTO> dtoList = new ArrayList<SysLogInfoDTO>();
-//        for(SysLogInfo log : list){
-//            dtoList.add(ConvertToDTO(log));
-//        }
-//        return dtoList;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/manager/DataBaseInfoManager.java b/src/main/java/com/casic/accessControl/sys/manager/DataBaseInfoManager.java
deleted file mode 100644
index b1395e6..0000000
--- a/src/main/java/com/casic/accessControl/sys/manager/DataBaseInfoManager.java
+++ /dev/null
@@ -1,19 +0,0 @@
-//package com.casic.accessControl.sys.manager;
-//
-//import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-//import com.casic.accessControl.sys.domain.DataBaseInfo;
-//import org.hibernate.Criteria;
-//import org.springframework.stereotype.Service;
-//
-///**
-// * Created by test203 on 2015/10/29.
-// */
-//@Service
-//public class DataBaseInfoManager extends HibernateEntityDao<DataBaseInfo>{
-//    public Criteria getCriteria(){
-//        return  getSession().createCriteria(DataBaseInfo.class);
-//    }
-//    public Object getDataBaseInfo(){
-//        return getCriteria().uniqueResult();
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/manager/OrclInfoManager.java b/src/main/java/com/casic/accessControl/sys/manager/OrclInfoManager.java
deleted file mode 100644
index d9804a1..0000000
--- a/src/main/java/com/casic/accessControl/sys/manager/OrclInfoManager.java
+++ /dev/null
@@ -1,127 +0,0 @@
-//package com.casic.accessControl.sys.manager;
-//
-//import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-//import com.casic.accessControl.core.page.Page;
-//import com.casic.accessControl.sys.domain.DataBaseInfo;
-//import com.casic.accessControl.sys.domain.OrclInfo;
-//import com.casic.accessControl.sys.dto.OrclInfoDTO;
-//import com.casic.accessControl.util.*;
-//import org.hibernate.Criteria;
-//import org.hibernate.criterion.Order;
-//import org.hibernate.criterion.Restrictions;
-//import org.springframework.jdbc.core.JdbcTemplate;
-//import org.springframework.stereotype.Service;
-//
-//import javax.annotation.Resource;
-//import java.io.File;
-//import java.io.IOException;
-//import java.text.ParseException;
-//import java.util.*;
-//
-///**
-//* Created by Administrator on 2015/8/17.
-//*/
-//@Service
-//public class OrclInfoManager extends HibernateEntityDao<OrclInfo> {
-//    @Resource
-//    private DataBaseInfoManager dataBaseInfoManager;
-//
-//    public void setDataBaseInfoManager(DataBaseInfoManager dataBaseInfoManager) {
-//        this.dataBaseInfoManager = dataBaseInfoManager;
-//    }
-//
-//    public Criteria getCriteria() {
-//        return getSession().createCriteria(OrclInfo.class);
-//    }
-//
-//    public DataTable<OrclInfoDTO> pageQueryOrclInfoDTO(String jsonParam, String beginDay, String endDay) throws ParseException {
-//        DataTableParameter dataTableParam = DataTableUtils.getDataTableParameterByJsonParam(jsonParam);
-//
-//        int start = dataTableParam.getiDisplayStart();
-//        int pageSize = dataTableParam.getiDisplayLength();
-//        int pageNo = (start / pageSize) + 1;
-//
-//        Criteria criteria = getCriteria();
-//        criteria.addOrder(Order.desc("id"));
-//
-//        if (StringUtils.isNotBlank(beginDay)) {
-//            criteria.add(Restrictions.ge("bkDay", DateUtils.sdf1.parse(beginDay)));
-//        }
-//        if (StringUtils.isNotBlank(endDay)) {
-//            Date date = DateUtils.sdf1.parse(endDay);
-//            Calendar calendar = Calendar.getInstance();
-//            calendar.setTime(date);
-//            calendar.add(Calendar.DATE, 1);
-//            criteria.add(Restrictions.le("bkDay", calendar.getTime()));
-//        }
-//
-//        Page page = pagedQuery(criteria, pageNo, pageSize);
-//
-//        List<OrclInfoDTO> dtoList = OrclInfoDTO.ConvertToDTO((List<OrclInfo>) page.getResult());
-//        DataTable<OrclInfoDTO> dt = new DataTable<OrclInfoDTO>();
-//        dt.setAaData(dtoList);
-//        dt.setiTotalDisplayRecords((int) page.getTotalCount());
-//        dt.setsEcho(dataTableParam.getsEcho());
-//        dt.setiTotalRecords((int) page.getTotalCount());
-//        return dt;
-//    }
-//
-//    public Map<String, Object> backupDB(String memo, String path) throws IOException, InterruptedException {
-//        Map<String, Object> map = new HashMap<String, Object>();
-//        DataBaseInfo db = (DataBaseInfo) dataBaseInfoManager.getDataBaseInfo();
-//        if (null == db) {
-//            map.put("success", false);
-//            map.put("message", "没有找到数据库配置！");
-//            return map;
-//        }
-//        String fileName = db.getSid() + DateUtils.sdfFile.format(new Date()) + ".dmp";
-//        String filePath = path + "\\" + fileName;
-//
-//        DataBaseUtils.doExp(db.getAccount(), db.getPassword(), db.getSid(), db.getOwner(), filePath);
-//
-//        OrclInfo orcl = new OrclInfo();
-//        orcl.setMemo(memo);
-//        orcl.setFileName(fileName);
-//        orcl.setFilePath(filePath);
-//        save(orcl);
-//
-//        map.put("success", true);
-//        return map;
-//    }
-//
-//    private String dropTables() {
-//        StringBuilder tables = new StringBuilder();
-//        JdbcTemplate jdbcTemplate = getJdbcTemplate();
-//        String sqlString = "SELECT TABLE_NAME FROM USER_TABLES WHERE TABLESPACE_NAME='USERS'";
-//        List<String> list = jdbcTemplate.queryForList(sqlString, java.lang.String.class);
-//        if (list.size() > 0) {
-//            for (String t : list) {
-//                tables.append(t).append(",");
-//                String sql = "DROP TABLE " + t + " CASCADE CONSTRAINTS";
-//                jdbcTemplate.execute(sql);
-//                System.out.println(sql);
-//            }
-//            return tables.deleteCharAt(tables.length() - 1).toString();
-//        }
-//        return "";
-//    }
-//
-//    public void doImp(Long id) throws IOException, InterruptedException {
-//        OrclInfoDTO dto = getDTO(id);
-//        if (StringUtils.isNotBlank(dto.getFilePath())) {
-//            String tbl = dropTables();
-//            DataBaseUtils.doImp("scott", "xxfw", "XXFW", dto.getFilePath(), tbl);
-//        }
-//    }
-//
-//    public OrclInfoDTO getDTO(Long id) {
-//        return OrclInfoDTO.ConvertToDTO(get(id));
-//    }
-//
-//    public void deleteDTO(Long id) {
-//        OrclInfo orcl = get(id);
-//        File file = new File(orcl.getFilePath());
-//        file.delete();
-//        remove(orcl);
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/manager/SysLogInfoManager.java b/src/main/java/com/casic/accessControl/sys/manager/SysLogInfoManager.java
deleted file mode 100644
index a2c83a4..0000000
--- a/src/main/java/com/casic/accessControl/sys/manager/SysLogInfoManager.java
+++ /dev/null
@@ -1,92 +0,0 @@
-//package com.casic.accessControl.sys.manager;
-//
-//
-//import com.casic.accessControl.core.hibernate.HibernateEntityDao;
-//import com.casic.accessControl.core.page.Page;
-//import com.casic.accessControl.sys.domain.SysLogInfo;
-//import com.casic.accessControl.sys.dto.ExcelInfoDTO;
-//import com.casic.accessControl.sys.dto.SysLogInfoDTO;
-//import com.casic.accessControl.util.*;
-//import com.casic.accessControl.xls.ExportExcel;
-//import org.hibernate.Criteria;
-//import org.hibernate.criterion.Order;
-//import org.hibernate.criterion.Restrictions;
-//import org.springframework.stereotype.Service;
-//
-//import java.io.FileOutputStream;
-//import java.io.IOException;
-//import java.io.OutputStream;
-//import java.text.ParseException;
-//import java.util.*;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Service
-//public class SysLogInfoManager extends HibernateEntityDao<SysLogInfo> {
-//
-//    public Criteria getCriteria() {
-//        return getSession().createCriteria(SysLogInfo.class);
-//    }
-//
-//    public DataTable<SysLogInfoDTO> pageQueryLogInfoDTO(String jsonParam, String logType, String beginDay, String endDay) throws ParseException {
-//        DataTableParameter dataTableParam = DataTableUtils.getDataTableParameterByJsonParam(jsonParam);
-//
-//        int start = dataTableParam.getiDisplayStart();
-//        int pageSize = dataTableParam.getiDisplayLength();
-//        int pageNo = (start / pageSize) + 1;
-//
-//        Criteria criteria = getCriteria();
-//        criteria.addOrder(Order.desc("id"));
-//
-//        if (StringUtils.isNotBlank(logType)) {
-//            criteria.add(Restrictions.like("logType", "%" + logType + "%"));
-//        }
-//        if (StringUtils.isNotBlank(beginDay)) {
-//            criteria.add(Restrictions.ge("logDay", DateUtils.sdf1.parse(beginDay)));
-//        }
-//        if (StringUtils.isNotBlank(endDay)) {
-//            Date date = DateUtils.sdf1.parse(endDay);
-//            Calendar calendar = Calendar.getInstance();
-//            calendar.setTime(date);
-//            calendar.add(Calendar.DATE, 1);
-//            criteria.add(Restrictions.le("logDay", calendar.getTime()));
-//        }
-//
-//        Page page = pagedQuery(criteria, pageNo, pageSize);
-//
-//        List<SysLogInfoDTO> dtoList = SysLogInfoDTO.ConvertToDTO((List<SysLogInfo>) page.getResult());
-//        DataTable<SysLogInfoDTO> dt = new DataTable<SysLogInfoDTO>();
-//        dt.setAaData(dtoList);
-//        dt.setiTotalDisplayRecords((int) page.getTotalCount());
-//        dt.setsEcho(dataTableParam.getsEcho());
-//        dt.setiTotalRecords((int) page.getTotalCount());
-//        return dt;
-//    }
-//
-//    public SysLogInfoDTO getDTO(Long id) {
-//        return SysLogInfoDTO.ConvertToDTO(get(id));
-//    }
-//
-//    public Map<String, Object> expSysLogToExcel(String logType, String beginDay, String endDay, String path) throws ParseException, IOException {
-//        Map<String, Object> map = new HashMap<String, Object>();
-//        Criteria criteria = getCriteria();
-//        criteria.add(Restrictions.like("logType", "%" + logType + "%"));
-//        if (StringUtils.isNotBlank(beginDay)) {
-//            criteria.add(Restrictions.ge("logDay", DateUtils.sdf1.parse(beginDay)));
-//        }
-//        if (StringUtils.isNotBlank(endDay)) {
-//            Calendar calendar = Calendar.getInstance();
-//            calendar.setTime(DateUtils.sdf1.parse(endDay));
-//            calendar.add(Calendar.DATE, 1);
-//            criteria.add(Restrictions.le("logDay", calendar.getTime()));
-//        }
-//        List<ExcelInfoDTO> dtoList = ExcelInfoDTO.ConvertToDTO(criteria.list());
-//        String[] headers = {"日志类型", "日志内容", "日期", "操作人"};
-//        OutputStream out = new FileOutputStream(path);
-//        ExportExcel<ExcelInfoDTO> ex = new ExportExcel<ExcelInfoDTO>();
-//        ex.exportExcel(headers, dtoList, out);
-//        map.put("success", true);
-//        return map;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/web/OrclInfoController.java b/src/main/java/com/casic/accessControl/sys/web/OrclInfoController.java
deleted file mode 100644
index 22fa833..0000000
--- a/src/main/java/com/casic/accessControl/sys/web/OrclInfoController.java
+++ /dev/null
@@ -1,96 +0,0 @@
-//package com.casic.accessControl.sys.web;
-//
-//import com.casic.accessControl.core.mapper.JsonMapper;
-//import com.casic.accessControl.sys.dto.OrclInfoDTO;
-//import com.casic.accessControl.sys.dto.SysLogInfoDTO;
-//import com.casic.accessControl.sys.manager.OrclInfoManager;
-//import com.casic.accessControl.util.DataBaseUtils;
-//import com.casic.accessControl.util.DataTable;
-//import com.casic.accessControl.util.DateUtils;
-//import com.casic.accessControl.util.StringUtils;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//
-//import javax.annotation.Resource;
-//import javax.persistence.ManyToOne;
-//import javax.servlet.http.HttpServletRequest;
-//import javax.servlet.http.HttpServletResponse;
-//import javax.servlet.http.HttpSession;
-//import java.util.Date;
-//import java.util.HashMap;
-//import java.util.Map;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Controller
-//@RequestMapping("sys")
-//public class OrclInfoController {
-//
-//    @Resource
-//    private OrclInfoManager orclInfoManager;
-//
-//    public void setOrclInfoManager(OrclInfoManager orclInfoManager) {
-//        this.orclInfoManager = orclInfoManager;
-//    }
-//
-//    @RequestMapping("orcl-info-list")
-//    public void listOrcl(String jsonParam,
-//                         @RequestParam(value = "beginDay", required = false) String beginDay,
-//                         @RequestParam(value = "endDay", required = false) String endDay,
-//                         HttpServletResponse response) {
-//        try {
-//            DataTable<OrclInfoDTO> dt = orclInfoManager.pageQueryOrclInfoDTO(jsonParam, beginDay, endDay);
-//            String json = new JsonMapper().toJson(dt);
-//            response.setCharacterEncoding("utf-8");
-//            response.getWriter().write(json);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//    }
-//
-//    @RequestMapping("orcl-info-save")
-//    @ResponseBody
-//    public Map<String, Object> saveOrcl(String memo, HttpServletRequest request) {
-//        Map<String, Object> map = new HashMap<String, Object>();
-//        try {
-//            String path = request.getSession().getServletContext().getRealPath("content\\dmp");
-//            map = orclInfoManager.backupDB(memo, path);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            map.put("success", false);
-//            map.put("message", "数据备份失败！");
-//        }
-//        return map;
-//    }
-//
-//    @RequestMapping("orcl-info-restore")
-//    @ResponseBody
-//    public Map<String, Object> restoreData(@RequestParam(value = "id", required = true) Long id) {
-//        Map<String, Object> map = new HashMap<String, Object>();
-//        try {
-//            orclInfoManager.doImp(id);
-//            map.put("success", true);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            map.put("success", false);
-//        }
-//        return map;
-//    }
-//
-//    @RequestMapping("orcl-info-delete")
-//    @ResponseBody
-//    public Map<String, Object> deleteOrclInfo(@RequestParam(value = "id", required = true) Long id) {
-//        Map<String, Object> map = new HashMap<String, Object>();
-//        try {
-//            orclInfoManager.deleteDTO(id);
-//            map.put("success", true);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            map.put("success", false);
-//        }
-//        return map;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/sys/web/SysLogInfoController.java b/src/main/java/com/casic/accessControl/sys/web/SysLogInfoController.java
deleted file mode 100644
index 86caa76..0000000
--- a/src/main/java/com/casic/accessControl/sys/web/SysLogInfoController.java
+++ /dev/null
@@ -1,81 +0,0 @@
-//package com.casic.accessControl.sys.web;
-//
-//import com.casic.accessControl.core.ext.mail.MailConsumer;
-//import com.casic.accessControl.core.mapper.JsonMapper;
-//import com.casic.accessControl.sys.domain.SysLogInfo;
-//import com.casic.accessControl.sys.dto.SysLogInfoDTO;
-//import com.casic.accessControl.sys.manager.SysLogInfoManager;
-//import com.casic.accessControl.util.DataTable;
-//import com.casic.accessControl.xls.ExportExcel;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.ui.Model;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//
-//import javax.annotation.Resource;
-//import javax.servlet.http.HttpServletRequest;
-//import javax.servlet.http.HttpServletResponse;
-//import java.io.*;
-//import java.util.ArrayList;
-//import java.util.HashMap;
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * Created by Administrator on 2015/8/17.
-// */
-//@Controller
-//@RequestMapping("sys")
-//public class SysLogInfoController {
-//
-//    @Resource
-//    private SysLogInfoManager sysLogInfoManager;
-//
-//    public void setSysLogInfoManager(SysLogInfoManager sysLogInfoManager) {
-//        this.sysLogInfoManager = sysLogInfoManager;
-//    }
-//
-//    @RequestMapping("log-info-list")
-//    public void list(String jsonParam
-//            , @RequestParam(value = "logType", required = false) String logType
-//            , @RequestParam(value = "beginDay", required = false) String beginDay
-//            , @RequestParam(value = "endDay", required = false) String endDay
-//            , HttpServletResponse response) {
-//        try {
-//            DataTable<SysLogInfoDTO> dt = sysLogInfoManager.pageQueryLogInfoDTO(jsonParam, logType, beginDay, endDay);
-//            String json = new JsonMapper().toJson(dt);
-//            response.setCharacterEncoding("utf-8");
-//            response.getWriter().write(json);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//    }
-//
-//    @RequestMapping("sys-log-msg")
-//    public String logMsg(@RequestParam(value = "id", required = true) Long id, Model model) {
-//        SysLogInfoDTO dto = sysLogInfoManager.getDTO(id);
-//        model.addAttribute("model", dto);
-//        return "sys/sys-log-msg";
-//    }
-//
-//    @RequestMapping("exp-sys-log")
-//    @ResponseBody
-//    public Map<String, Object> expSysLog(@RequestParam(value = "logType", required = false) String logType,
-//                                         @RequestParam(value = "beginDay", required = false) String beginDay,
-//                                         @RequestParam(value = "endDay", required = false) String endDay,
-//                                         HttpServletResponse response,
-//                                         HttpServletRequest request) throws IOException {
-//        Map<String, Object> map = null;
-//        try {
-//            String path = request.getSession().getServletContext().getRealPath("/") + "\\content\\xls\\log.xls";
-//            map = sysLogInfoManager.expSysLogToExcel(logType, beginDay, endDay, path);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            map = new HashMap<String, Object>();
-//            map.put("success", false);
-//            map.put("message", "Excel文件生成失败！");
-//        }
-//        return map;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/task/web/TaskController.java b/src/main/java/com/casic/accessControl/task/web/TaskController.java
index db515b4..ce1e67c 100644
--- a/src/main/java/com/casic/accessControl/task/web/TaskController.java
+++ b/src/main/java/com/casic/accessControl/task/web/TaskController.java
@@ -1,7 +1,5 @@
 package com.casic.accessControl.task.web;
 
-import com.casic.accessControl.feature.domain.Feature;
-import com.casic.accessControl.feature.manager.FeatureManager;
 import com.casic.accessControl.marker.domain.Marker;
 import com.casic.accessControl.marker.dto.MarkerDto;
 import com.casic.accessControl.marker.manager.MarkerManager;
@@ -56,8 +54,8 @@
     @Resource
     private RoleManager roleManager;
 
-    @Resource
-    private FeatureManager featureManager;
+//    @Resource
+//    private FeatureManager featureManager;
 
     @RequestMapping("task-info-list")
     public void list(@RequestParam(required = true) String jsonParam, @RequestParam(required = false) Integer status, @RequestParam(required = false) String startDate, @RequestParam(required = false) String endDate, HttpServletResponse response, HttpSession session) {
@@ -149,9 +147,7 @@
 
     @RequestMapping("task-Save")
     @ResponseBody
-    public Map<String, Object> saveTask(@RequestParam(value = "areaId", required = true) String areaId,
-                                        @RequestParam(value = "lineId", required = true) String lineId,
-                                        @RequestParam(value = "markers", required = true) String markerIds,
+    public Map<String, Object> saveTask(@RequestParam(value = "markers", required = true) String markerIds,
                                         @RequestParam(value = "patrolerId", required = true) String patrolerId,
                                         @RequestParam(value = "description", required = true) String description,
                                         HttpSession session) {
@@ -166,21 +162,22 @@
             Task task = new Task();
             User patroler = userManager.get(Long.parseLong(patrolerId));
             List<Marker> markers = new ArrayList<Marker>();
-            if (areaId.equalsIgnoreCase(""))//绘制工单
-            {
-                markers = markerManager.getMarkerByIds(markerIds);
-            } else//按区域下发工单
-            {
-                Feature feature = null;
-                Feature line = null;
-                if (StringUtils.isNotBlank(areaId)) {
-                    feature = featureManager.get(Long.parseLong(areaId));
-                }
-                if (StringUtils.isNotBlank(lineId)) {
-                    line = featureManager.get(Long.valueOf(lineId));
-                }
-                markers = markerManager.getMarkerByFeature(feature, line);
-            }
+//            if (areaId.equalsIgnoreCase(""))//绘制工单
+//            {
+//                markers = markerManager.getMarkerByIds(markerIds);
+//            } else//按区域下发工单
+//            {
+//                Feature feature = null;
+//                Feature line = null;
+//                if (StringUtils.isNotBlank(areaId)) {
+//                    feature = featureManager.get(Long.parseLong(areaId));
+//                }
+//                if (StringUtils.isNotBlank(lineId)) {
+//                    line = featureManager.get(Long.valueOf(lineId));
+//                }
+//                markers = markerManager.getMarkerByFeature(feature, line);
+//            }
+            markers = markerManager.getMarkerByIds(markerIds);
             if (markers == null || markers.size() == 0) {
                 map.put("success", false);
                 map.put("message", "未包含标识点！");
diff --git a/src/main/java/com/casic/accessControl/xls/ReadColumnFromExcel.java b/src/main/java/com/casic/accessControl/xls/ReadColumnFromExcel.java
deleted file mode 100644
index ead76c7..0000000
--- a/src/main/java/com/casic/accessControl/xls/ReadColumnFromExcel.java
+++ /dev/null
@@ -1,220 +0,0 @@
-//package com.casic.accessControl.xls;
-//
-//import com.casic.accessControl.shp.dto.MetaInfoDTO;
-//import org.apache.poi.hssf.usermodel.HSSFCell;
-//import org.apache.poi.hssf.usermodel.HSSFRow;
-//import org.apache.poi.hssf.usermodel.HSSFSheet;
-//import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-//import org.apache.poi.xssf.usermodel.XSSFCell;
-//import org.apache.poi.xssf.usermodel.XSSFRow;
-//import org.apache.poi.xssf.usermodel.XSSFSheet;
-//import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-//
-//import java.io.FileInputStream;
-//import java.io.IOException;
-//import java.io.InputStream;
-//import java.util.ArrayList;
-//import java.util.HashMap;
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * Created by Administrator on 2015/9/1.
-// */
-//public class ReadColumnFromExcel {
-//
-//    public static List<List<MetaInfoDTO>> readExcel(String path, Map<String, MetaInfoDTO> map) throws IOException {
-//        if (path == null || Common.EMPTY.equals(path)) {
-//            return null;
-//        } else {
-//            String postfix = Util.getPostfix(path);
-//            if (!Common.EMPTY.equals(postfix)) {
-//                if (Common.OFFICE_EXCEL_2003_POSTFIX.equals(postfix)) {
-//                    return readXls(path,map);
-//                } else if (Common.OFFICE_EXCEL_2010_POSTFIX.equals(postfix)) {
-//                    return readXlsx(path,map);
-//                }
-//            } else {
-//                System.out.println(path + Common.NOT_EXCEL_FILE);
-//            }
-//        }
-//        return new ArrayList<List<MetaInfoDTO>>();
-//    }
-//
-//    public static Map<String,Object> CheckColumnExcel(String path) throws  IOException{
-//        Map<String,Object> map = new HashMap<String, Object>();
-//        if (path == null || Common.EMPTY.equals(path)) {
-//            map.put("success",false);
-//            map.put("message","文件路径不能为空！");
-//        } else {
-//            String postfix = Util.getPostfix(path);
-//            if (!Common.EMPTY.equals(postfix)) {
-//                if (Common.OFFICE_EXCEL_2003_POSTFIX.equals(postfix)) {
-//                    map = CheckXls(path);
-//                } else if (Common.OFFICE_EXCEL_2010_POSTFIX.equals(postfix)) {
-//                    map = CheckXlsx(path);
-//                }
-//            } else {
-//                map.put("success",false);
-//                map.put("message",path + Common.NOT_EXCEL_FILE);
-//            }
-//        }
-//        return map;
-//    }
-//
-//    public static Map<String,Object> CheckXlsx(String path) {
-//        Map<String,Object> map = new HashMap<String, Object>();
-//        return map;
-//    }
-//
-//    public static Map<String, Object> CheckXls(String path) {
-//        Map<String,Object> map = new HashMap<String, Object>();
-//        return map;
-//    }
-//
-//
-//    /**
-//     * Read the Excel 2010
-//     *
-//     * @param path the path of the excel file
-//     * @param map
-//     * @return
-//     * @throws IOException
-//     */
-//    public static List<List<MetaInfoDTO>> readXlsx(String path, Map<String, MetaInfoDTO> map) throws IOException {
-//        System.out.println(Common.PROCESSING + path);
-//        InputStream is = new FileInputStream(path);
-//        XSSFWorkbook xssfWorkbook = new XSSFWorkbook(is);
-//
-//
-//        XSSFSheet xssfSheet = xssfWorkbook.getSheetAt(0);
-//        if (xssfSheet == null ) {
-//            return new ArrayList<List<MetaInfoDTO>>();
-//        }
-//
-//        //获取标题栏信息
-//        XSSFRow xssfRow = xssfSheet.getRow(0);
-//        List<String> headers = new ArrayList<String>();
-//        if (xssfRow != null) {
-//            for (int colNum = xssfRow.getFirstCellNum(); colNum < xssfRow.getLastCellNum(); colNum++) {
-//                XSSFCell cell = xssfRow.getCell(colNum);
-//                if (cell != null) {
-//                    headers.add(cell.getStringCellValue());
-//                }else {
-//                    break;
-//                }
-//            }
-//        }
-//
-//        List<List<MetaInfoDTO>> tbl = new ArrayList<List<MetaInfoDTO>>();
-//        for (int rowNum = 1; rowNum <= xssfSheet.getLastRowNum(); rowNum++) {
-//            xssfRow = xssfSheet.getRow(rowNum);
-//            if (xssfRow != null) {
-//                List<MetaInfoDTO> list = new ArrayList<MetaInfoDTO>();
-//                for (int colNum = xssfRow.getFirstCellNum(); colNum < xssfRow.getLastCellNum(); colNum++) {
-//                    XSSFCell cell = xssfRow.getCell(colNum);
-//                    if (cell != null) {
-//                        MetaInfoDTO dto = getValue(cell,map.get(headers.get(colNum)));
-//                        if(null!=dto){
-//                            list.add(dto);
-//                        }
-//                    }else {
-//                        break;
-//                    }
-//                }
-//
-//                tbl.add(list);
-//            }
-//        }
-//        return tbl;
-//    }
-//
-//    /**
-//     * Read the Excel 2003-2007
-//     *
-//     * @param path the path of the Excel
-//     * @param map
-//     * @return
-//     * @throws IOException
-//     */
-//    public static List<List<MetaInfoDTO>> readXls(String path, Map<String, MetaInfoDTO> map) throws IOException {
-//        System.out.println(Common.PROCESSING + path);
-//        InputStream is = new FileInputStream(path);
-//        HSSFWorkbook hssfWorkbook = new HSSFWorkbook(is);
-//
-//        // Read the Sheet
-//        HSSFSheet hssfSheet = hssfWorkbook.getSheetAt(0);
-//        if (hssfSheet == null ) {
-//            return new ArrayList<List<MetaInfoDTO>>();
-//        }
-//
-//        //获取标题栏信息
-//        HSSFRow hssfRow = hssfSheet.getRow(0);
-//        List<String> headers = new ArrayList<String>();
-//        if (hssfRow != null) {
-//            for (int colNum = hssfRow.getFirstCellNum(); colNum < hssfRow.getLastCellNum(); colNum++) {
-//                HSSFCell cell = hssfRow.getCell(colNum);
-//                if (cell != null) {
-//                    headers.add(cell.getStringCellValue());
-//                }else {
-//                    break;
-//                }
-//            }
-//        }
-//
-//        List<List<MetaInfoDTO>> tbl = new ArrayList<List<MetaInfoDTO>>();
-//        for (int rowNum = 1; rowNum <= hssfSheet.getLastRowNum(); rowNum++) {
-//            hssfRow = hssfSheet.getRow(rowNum);
-//            if (hssfRow != null) {
-//                List<MetaInfoDTO> list = new ArrayList<MetaInfoDTO>();
-//                for (int colNum = hssfRow.getFirstCellNum(); colNum < hssfRow.getLastCellNum(); colNum++) {
-//                    HSSFCell cell = hssfRow.getCell(colNum);
-//                    if (cell != null) {
-//                        MetaInfoDTO dto = getValue(cell, map.get(headers.get(colNum)));
-//                        if(null!=dto){
-//                            list.add(dto);
-//                        }
-//                    }else {
-//                        break;
-//                    }
-//                }
-//
-//                tbl.add(list);
-//            }
-//        }
-//
-//        return tbl;
-//    }
-//
-//    @SuppressWarnings("static-access")
-//    public static MetaInfoDTO getValue(XSSFCell xssfCell,MetaInfoDTO dto) {
-//        if(dto!=null){
-//            MetaInfoDTO t = new MetaInfoDTO();
-//            t.setLayerName(dto.getMetaName());
-//            t.setName(dto.getMetaName());
-//            t.setWidth(dto.getWidth());
-//            t.setType(dto.getType());
-//            t.setCount(dto.getCount());
-//            t.setIsNull(dto.getIsNull());
-//            t.setText(xssfCell.getStringCellValue());
-//            return t;
-//        }
-//        return null;
-//    }
-//
-//    @SuppressWarnings("static-access")
-//    public static MetaInfoDTO getValue(HSSFCell  hssfCell,MetaInfoDTO dto) {
-//        if(dto!=null){
-//            MetaInfoDTO t = new MetaInfoDTO();
-//            t.setName(dto.getMetaName());
-//            t.setLayerName(dto.getMetaName());
-//            t.setWidth(dto.getWidth());
-//            t.setType(dto.getType());
-//            t.setIsNull(dto.getIsNull());
-//            t.setCount(dto.getCount());
-//            t.setText(hssfCell.getStringCellValue());
-//            return t;
-//        }
-//        return null;
-//    }
-//}
diff --git a/src/main/java/com/casic/accessControl/xls/ReadUserInfoFromExcel.java b/src/main/java/com/casic/accessControl/xls/ReadUserInfoFromExcel.java
deleted file mode 100644
index 0625858..0000000
--- a/src/main/java/com/casic/accessControl/xls/ReadUserInfoFromExcel.java
+++ /dev/null
@@ -1,155 +0,0 @@
-//package com.casic.accessControl.xls;
-//
-//import com.casic.accessControl.org.dto.UserInfoDTO;
-//import com.casic.accessControl.shp.dto.MetaInfoDTO;
-//import com.casic.accessControl.util.StringUtils;
-//import org.apache.poi.hssf.usermodel.HSSFCell;
-//import org.apache.poi.hssf.usermodel.HSSFRow;
-//import org.apache.poi.hssf.usermodel.HSSFSheet;
-//import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-//import org.apache.poi.xssf.usermodel.XSSFCell;
-//import org.apache.poi.xssf.usermodel.XSSFRow;
-//import org.apache.poi.xssf.usermodel.XSSFSheet;
-//import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-//
-//import java.io.FileInputStream;
-//import java.io.IOException;
-//import java.io.InputStream;
-//import java.util.ArrayList;
-//import java.util.HashMap;
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * Created by test203 on 2015/12/24.
-// */
-//public class ReadUserInfoFromExcel {
-//
-//    public static List<UserInfoDTO> readExcel(String path) throws IOException {
-//        if (path == null || Common.EMPTY.equals(path)) {
-//            return null;
-//        } else {
-//            String postfix = Util.getPostfix(path);
-//            if (!Common.EMPTY.equals(postfix)) {
-//                if (Common.OFFICE_EXCEL_2003_POSTFIX.equals(postfix)) {
-//                    return readXls(path);
-//                } else if (Common.OFFICE_EXCEL_2010_POSTFIX.equals(postfix)) {
-//                    return readXlsx(path);
-//                }
-//            } else {
-//                System.out.println(path + Common.NOT_EXCEL_FILE);
-//            }
-//        }
-//        return new ArrayList<UserInfoDTO>();
-//    }
-//
-//    public static Map<String,Object> CheckColumnExcel(String path) throws  IOException{
-//        Map<String,Object> map = new HashMap<String, Object>();
-//        if (path == null || Common.EMPTY.equals(path)) {
-//            map.put("success",false);
-//            map.put("message","文件路径不能为空！");
-//        } else {
-//            String postfix = Util.getPostfix(path);
-//            if (!Common.EMPTY.equals(postfix)) {
-//                if (Common.OFFICE_EXCEL_2003_POSTFIX.equals(postfix)) {
-//                    map = CheckXls(path);
-//                } else if (Common.OFFICE_EXCEL_2010_POSTFIX.equals(postfix)) {
-//                    map = CheckXlsx(path);
-//                }
-//            } else {
-//                map.put("success",false);
-//                map.put("message",path + Common.NOT_EXCEL_FILE);
-//            }
-//        }
-//        return map;
-//    }
-//
-//    public static Map<String,Object> CheckXlsx(String path) {
-//        Map<String,Object> map = new HashMap<String, Object>();
-//        return map;
-//    }
-//
-//    public static Map<String, Object> CheckXls(String path) {
-//        Map<String,Object> map = new HashMap<String, Object>();
-//        return map;
-//    }
-//
-//
-//    /**
-//     * Read the Excel 2010
-//     *
-//     * @param path the path of the excel file
-//     * @return
-//     * @throws IOException
-//     */
-//    public static List<UserInfoDTO> readXlsx(String path) throws IOException {
-//        System.out.println(Common.PROCESSING + path);
-//        InputStream is = new FileInputStream(path);
-//        XSSFWorkbook xssfWorkbook = new XSSFWorkbook(is);
-//
-//
-//        XSSFSheet xssfSheet = xssfWorkbook.getSheetAt(0);
-//        if (xssfSheet == null ) {
-//            return new ArrayList<UserInfoDTO>();
-//        }
-//
-//        XSSFRow xssfRow = xssfSheet.getRow(0);
-//        List<UserInfoDTO> list = new ArrayList<UserInfoDTO>();
-//        for (int rowNum = 1; rowNum <= xssfSheet.getLastRowNum(); rowNum++) {
-//            xssfRow = xssfSheet.getRow(rowNum);
-//            if (xssfRow != null) {
-//                if(!StringUtils.isNotBlank(xssfRow.getCell(0).getStringCellValue())){
-//                   break;
-//                }
-//                UserInfoDTO dto = new UserInfoDTO();
-//                dto.setUsername(xssfRow.getCell(0).getStringCellValue());
-//                dto.setTel(xssfRow.getCell(1).getStringCellValue());
-//                dto.setAddress(xssfRow.getCell(2).getStringCellValue());
-//                dto.setDescn(xssfRow.getCell(3).getStringCellValue());
-//                dto.setPassed(false);
-//                dto.setPassword("111111");
-//                list.add(dto);
-//            }
-//        }
-//        return list;
-//    }
-//
-//    /**
-//     * Read the Excel 2003-2007
-//     *
-//     * @param path the path of the Excel
-//     * @return
-//     * @throws IOException
-//     */
-//    public static List<UserInfoDTO> readXls(String path) throws IOException {
-//        System.out.println(Common.PROCESSING + path);
-//        InputStream is = new FileInputStream(path);
-//        HSSFWorkbook hssfWorkbook = new HSSFWorkbook(is);
-//
-//        // Read the Sheet
-//        HSSFSheet hssfSheet = hssfWorkbook.getSheetAt(0);
-//        if (hssfSheet == null ) {
-//            return new ArrayList<UserInfoDTO>();
-//        }
-//
-//        HSSFRow hssfRow = hssfSheet.getRow(0);
-//        List<UserInfoDTO> list = new ArrayList<UserInfoDTO>();
-//        for (int rowNum = 1; rowNum <= hssfSheet.getLastRowNum(); rowNum++) {
-//            hssfRow = hssfSheet.getRow(rowNum);
-//            if (hssfRow != null) {
-//                if(!StringUtils.isNotBlank(hssfRow.getCell(0).getStringCellValue())){
-//                    break;
-//                }
-//                UserInfoDTO dto = new UserInfoDTO();
-//                dto.setUsername(hssfRow.getCell(0).getStringCellValue());
-//                dto.setPassword("111111");
-//                dto.setPassed(false);
-//                dto.setTel(hssfRow.getCell(1).getStringCellValue());
-//                dto.setAddress(hssfRow.getCell(2).getStringCellValue());
-//                dto.setDescn(hssfRow.getCell(3).getStringCellValue());
-//                list.add(dto);
-//            }
-//        }
-//        return list;
-//    }
-//}
diff --git a/src/main/webapp/s/app/task/task.js b/src/main/webapp/s/app/task/task.js
index eef7bff..7134d54 100644
--- a/src/main/webapp/s/app/task/task.js
+++ b/src/main/webapp/s/app/task/task.js
@@ -212,15 +212,13 @@
         },
 
         //上传工单
-        uploadTaskCallBack: function (areaId, lineId, patrolerId, description) {
+        uploadTaskCallBack: function (patrolerId, description) {
             $.ajax({
                 type: "get",
                 url: $('#context').val() + "/task/task-Save.do",
                 dataType: "json",
                 cache: false,
                 data: {
-                    areaId: areaId,
-                    lineId: lineId,
                     markers: taskMarkers,
                     patrolerId: patrolerId,
                     description: description
@@ -500,7 +498,7 @@
                 //alert(taskMarkers);
                 var patrolerId = $("#selectPatroler2").val();
                 var description = $("#description2").val();
-                Task.uploadTaskCallBack("", "", patrolerId, description);
+                Task.uploadTaskCallBack(patrolerId, description);
                 $('#addTaskModal2').modal('hide');
                 $("#description2").val("");
             });