重构代码

cql-service/pom.xml

@@ -99,6 +99,12 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>cn.com.taiji</groupId>
+            <artifactId>tile-common</artifactId>
+            <version>1.0</version>
+        </dependency>
+
     </dependencies>
 
 

cql-service/src/main/java/cn/com/taiji/cql/service/IECqlService.java

@@ -1,11 +1,13 @@
 package cn.com.taiji.cql.service;
 
 
+import cn.com.taiji.common.domain.PageResult;
+
 import java.util.List;
 import java.util.Map;
 
 public interface IECqlService {
 
 
-    List<Map<String,Object>> cqlQuery(Map<String, Object> mapParams,String cql,Map<String,Object> sortMaps);
+    PageResult cqlQuery4Mysql(Map<String, Object> mapParams, String cql, Map<String,Object> sortMaps, Map<String, Object> pageParams);
 }

cql-service/src/main/java/cn/com/taiji/cql/service/impl/ECqlServiceImpl.java

@@ -1,4 +1,6 @@
 package cn.com.taiji.cql.service.impl;
+import cn.com.taiji.common.domain.PageResult;
+import cn.com.taiji.common.enums.CommonConstant;
 import cn.com.taiji.cql.service.IECqlService;
 import lombok.extern.slf4j.Slf4j;
 import org.geotools.api.data.DataStore;
@@ -34,7 +36,7 @@ public class ECqlServiceImpl implements IECqlService{
      * @return
      */
     @Override
-    public List<Map<String, Object>> cqlQuery(Map<String, Object> mapParams, String cql,Map<String,Object> sortMaps) {
+    public PageResult cqlQuery4Mysql(Map<String, Object> mapParams, String cql, Map<String,Object> sortMaps, Map<String, Object> pageParams) {
 
         List<Map<String, Object>> dataList = new ArrayList<Map<String, Object>>();
 
@@ -44,6 +46,18 @@ public class ECqlServiceImpl implements IECqlService{
 
         String database = mapParams.get(JDBCDataStoreFactory.DATABASE.key).toString();
 
+        //查询记录总数
+        Long count =0l;
+
+        //当前页数
+        Long pageNumber= CommonConstant.PAGE_NUMBER;
+
+        //一页显示多少条记录
+        Long pageSize=CommonConstant.PAGE_SIZE;
+
+        //总页数
+        Long pageCount =0l;
+
 
         try {
 
@@ -74,7 +88,7 @@ public class ECqlServiceImpl implements IECqlService{
 
 
 
-                if(sortMaps.keySet().size() >0){
+                if(sortMaps !=null && !"".equals(sortMaps) && sortMaps.keySet().size() >0){
 
                     List<SortByImpl> sortByList = new ArrayList<SortByImpl>();
 
@@ -104,6 +118,40 @@ public class ECqlServiceImpl implements IECqlService{
 
 
 
+                //查询记录总数
+                count = Long.valueOf(fSource.getCount(query));
+
+                if(pageParams !=null && !"".equals(pageParams) && pageParams.keySet().size() >0){
+
+                    if(pageParams.containsKey("pageNumber")){
+
+                        pageNumber = Long.valueOf(pageParams.get("pageNumber").toString());
+
+                    }
+
+                    if(pageParams.containsKey("pageSize")){
+
+                        pageSize = Long.valueOf(pageParams.get("pageSize").toString());
+                    }
+
+                    //设置分页查询参数
+                    query.setStartIndex(pageNumber.intValue());
+
+                    query.setMaxFeatures(pageSize.intValue());
+
+                    //计算总页数
+                    if (count%pageSize ==0){
+
+                        pageCount = count/pageSize;
+
+                    }else{
+
+                        pageCount = count/pageSize +1;
+                    }
+                }
+
+
+
                 SimpleFeatureCollection simpleFeatureCollection =fSource.getFeatures(query);
 
                 if(simpleFeatureCollection !=null){
@@ -138,6 +186,8 @@ public class ECqlServiceImpl implements IECqlService{
 
                     }
 
+                    simpleFeatureIterator.close();
+
 
                 }
 
@@ -161,7 +211,15 @@ public class ECqlServiceImpl implements IECqlService{
             }
         }
 
+        if(count >0){
+
+            return PageResult.<List<Map<String, Object>>>builder().datas(dataList).resp_code(0).resp_msg("操作成功!").pageNumber(pageNumber).pageCount(pageCount).recordCount(count).build();
+
+        }else{
+
+            return PageResult.<List<Map<String, Object>>>builder().datas(dataList).resp_code(1).resp_msg("操作成功,但没有查找到记录!").pageNumber(pageNumber).pageCount(pageCount).recordCount(count).build();
+        }
+
 
-        return dataList;
     }
 }

tile-common/src/main/java/cn/com/taiji/cn/com/taiji/common/domain/Result.java

@@ -1,83 +0,0 @@
-package cn.com.taiji.cn.com.taiji.common.domain;
-
-import cn.com.taiji.cn.com.taiji.common.enums.ErrorCodeEnum;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author zzyx 2023/12/14
- */
-@Data
-public class Result<T> {
-
-
-    @ApiModelProperty("响应码")
-    private int code;
-
-    @ApiModelProperty("消息")
-    private String msg;
-
-    @ApiModelProperty("返回对象")
-    private T data;
-
-    public int getCode() {
-        return code;
-    }
-
-    public void setCode(int code) {
-        this.code = code;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
-
-    public T getData() {
-        return data;
-    }
-
-    public void setData(T data) {
-        this.data = data;
-    }
-
-    public static <T> Result<T> ok() {
-        return ok(null);
-    }
-
-    public static <T> Result<T> ok(T data) {
-        return init(data, ErrorCodeEnum.SUCCESS);
-    }
-
-    public static <T> Result<T> error() {
-        return init(null, ErrorCodeEnum.INTERNAL_SERVER_ERROR);
-    }
-
-    public static <T> Result<T> error(int code, String message) {
-        return initByCodeAndMessage(code, message);
-    }
-
-    public static <T> Result<T> error(ErrorCodeEnum codeEnum) {
-        return init(null, codeEnum);
-    }
-
-
-    private static <T> Result<T> init(T data, ErrorCodeEnum codeEnum) {
-        Result<T> result = new Result<>();
-        result.setData(data);
-        result.setMsg(codeEnum.getMessage());
-        result.setCode(codeEnum.getCode());
-        return result;
-    }
-
-    private static <T> Result<T> initByCodeAndMessage(int code, String message) {
-        Result<T> result = new Result<>();
-        result.setData(null);
-        result.setCode(code);
-        result.setMsg(message);
-        return result;
-    }
-}

tile-common/src/main/java/cn/com/taiji/common/domain/PageInfo.java

@@ -0,0 +1,22 @@
+package cn.com.taiji.common.domain;
+
+import cn.com.taiji.common.enums.CommonConstant;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 分页参数
+ */
+@Data
+public class PageInfo implements Serializable {
+
+    /**
+     *当前页数
+     */
+    private Long pageNumber= CommonConstant.PAGE_NUMBER;
+    /**
+     *一页显示多少条记录
+     */
+    private Long pageSize=CommonConstant.PAGE_SIZE;
+}

tile-common/src/main/java/cn/com/taiji/common/domain/PageResult.java

@@ -0,0 +1,57 @@
+package cn.com.taiji.common.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 扩展分页信息
+ * @param <T>
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PageResult<T> implements Serializable {
+
+    private static final long serialVersionUID = -275582248840137389L;
+
+    /**
+     *当前页数
+     */
+    private Long pageNumber;
+    /**
+     *一页显示多少条记录
+     */
+    private Long pageSize;
+
+    /**
+     * 总页数
+     */
+    private Long pageCount;
+
+
+     /**
+      * 总记录数
+      */
+    private Long recordCount=0l;
+
+    /**
+     * 是否成功：0 成功、1 成功，但记录为空、-1 失败
+     */
+    private Integer resp_code;
+
+
+    /**
+     * 响应码描述信息
+     */
+    private String resp_msg;
+
+    /**
+     * 当前页结果集
+     */
+    private T datas;
+}

tile-common/src/main/java/cn/com/taiji/common/domain/Result.java

@@ -0,0 +1,56 @@
+package cn.com.taiji.common.domain;
+
+import cn.com.taiji.common.enums.CodeEnum;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Author: stone
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class Result<T> implements Serializable {
+
+    private T datas;
+
+    /**
+     * 是否成功：0 成功、1 成功，但记录为空、-1 失败、2参数校验不通过
+     */
+    private Integer resp_code;
+    private String resp_msg;
+
+    public static <T> Result<T> succeed(String msg) {
+        return of(null, CodeEnum.SUCCESS.getCode(), msg);
+    }
+
+    public static <T> Result<T> succeed(T model, String msg) {
+        return of(model, CodeEnum.SUCCESS.getCode(), msg);
+    }
+
+    public static <T> Result<T> succeed(T model) {
+        return of(model, CodeEnum.SUCCESS.getCode(), "");
+    }
+
+    public static <T> Result<T> of(T datas, Integer code, String msg) {
+        return new Result<>(datas, code, msg);
+    }
+
+    public static <T> Result<T> failed(String msg) {
+        return of(null, CodeEnum.ERROR.getCode(), msg);
+    }
+
+    public static <T> Result<T> failed(T model, String msg) {
+        return of(model, CodeEnum.ERROR.getCode(), msg);
+    }
+    public static <T> Result<T> defFixNull(String msg) {
+        return of(null, CodeEnum.ISNULL.getCode(), msg);
+    }
+
+    public static <T> Result<T> notData(String msg) {
+        return of(null, CodeEnum.NOTDATA.getCode(), msg);
+    }
+}

tile-common/src/main/java/cn/com/taiji/common/enums/CodeEnum.java

@@ -0,0 +1,21 @@
+package cn.com.taiji.common.enums;
+
+/**
+ * @Author: stone
+ */
+public enum CodeEnum {
+    SUCCESS(0),
+    ERROR(-1),
+    ISNULL(2),
+    NOTDATA(1);
+
+    private Integer code;
+
+    CodeEnum(Integer code) {
+        this.code = code;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+}

tile-common/src/main/java/cn/com/taiji/common/enums/CommonConstant.java

@@ -0,0 +1,11 @@
+package cn.com.taiji.common.enums;
+
+/**
+ * 全局公共常量
+ */
+public interface CommonConstant {
+
+    Long PAGE_SIZE = 50l;
+
+    Long PAGE_NUMBER = 0l;
+}

tile-common/src/main/java/cn/com/taiji/cn/com/taiji/common/enums/ErrorCodeEnum.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.cn.com.taiji.common.enums;
+package cn.com.taiji.common.enums;
 
 import lombok.Getter;
 

tile-service/src/main/java/cn/com/taiji/tile/service/impl/TileServiceImpl.java

@@ -1,4 +1,5 @@
 package cn.com.taiji.tile.service.impl;
+import cn.com.taiji.common.domain.PageResult;
 import cn.com.taiji.cql.model.GeoDataSource;
 import cn.com.taiji.cql.model.GeoRequestParam;
 import cn.com.taiji.cql.service.IECqlService;
@@ -50,14 +51,19 @@ public class TileServiceImpl implements ITileService {
         cqlDsParams.put(JDBCDataStoreFactory.PASSWD.key, geoDs.getUserPassword());
         cqlDsParams.put("tableName", geoDs.getTableName());
 
+        //组装排序参数
         Map<String, Object> sortParams = new HashMap<String, Object>();
         sortParams.put("sort","asc");
 
-        List<Map<String, Object>> cqlDataList = ecqlService.cqlQuery(cqlDsParams,filterCql,sortParams);
+        PageResult pageResult = ecqlService.cqlQuery4Mysql(cqlDsParams,filterCql,sortParams,null);
+
+        if(pageResult.getRecordCount() >0){
+
+            List<Map<String, Object>> cqlDataList = (List<Map<String, Object>>) pageResult.getDatas();
 
-        if(cqlDataList.size() >0){
             //3根据空间地理数据生成图层二进制数据
             System.out.println("返回的数据:"+cqlDataList.toString());
+
             return TileUtils.getTile(cqlDataList, requestParam.getBbox());
 
         }else{

tile-web/src/main/java/cn/com/taiji/web/config/EnterpriseConfig.java

@@ -0,0 +1,32 @@
+package cn.com.taiji.web.config;
+
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@Data
+public class EnterpriseConfig {
+
+    @Value("${ent.ds.ip}")
+    private String dsIp;
+
+    @Value("${ent.ds.port}")
+    private String dsPort;
+
+    @Value("${ent.ds.username}")
+    private String dsUserName;
+
+    @Value("${ent.ds.password}")
+    private String dsPassword;
+
+    @Value("${ent.ds.basename}")
+    private String dsBaseName;
+
+    @Value("${ent.ds.tablename}")
+    private String dsTableName;
+
+    @Value("${ent.ds.dbtype}")
+    private String dbType;
+
+}

tile-web/src/main/java/cn/com/taiji/web/controller/EnterpriseController.java

@@ -0,0 +1,60 @@
+package cn.com.taiji.web.controller;
+
+import cn.com.taiji.common.domain.PageResult;
+import cn.com.taiji.common.domain.Result;
+import cn.com.taiji.cql.service.IECqlService;
+import cn.com.taiji.web.service.IEnterpriseService;
+import cn.com.taiji.web.vo.DeviceVo;
+import cn.com.taiji.web.vo.EnterpriseVo;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+
+/**
+ *企业一张图通用查询控制器
+ *
+ * @author makejava
+ * @since 2021-04-22 16:53:35
+ */
+@Slf4j
+@RestController
+public class EnterpriseController {
+
+
+    @Autowired
+    private IEnterpriseService enterpriseService;
+
+
+    /**
+     *企业列表查询接口
+     * @param enterpriseVo
+     */
+    @PostMapping("/enterpriseQuery")
+    public PageResult enterpriseQuery(@RequestBody EnterpriseVo enterpriseVo) throws Exception {
+
+        return enterpriseService.enterpriseQuery(enterpriseVo);
+    }
+
+
+    /**
+     * 根据圆心和半径查找周边企业设备
+     * @param deviceVo
+     * @return
+     * @throws Exception
+     */
+
+    @PostMapping("/deviceQuery")
+    public Result deviceQuery(@RequestBody DeviceVo deviceVo) throws Exception {
+
+        return enterpriseService.deviceQuery(deviceVo);
+    }
+
+
+
+}

tile-web/src/main/java/cn/com/taiji/web/controller/TileWebController.java

@@ -2,7 +2,7 @@ package cn.com.taiji.web.controller;
 
 
 
-import cn.com.taiji.cn.com.taiji.common.domain.Result;
+import cn.com.taiji.common.domain.Result;
 import cn.com.taiji.cql.model.GeoDataSource;
 import cn.com.taiji.cql.model.GeoRequestParam;
 import cn.com.taiji.tile.service.ITileService;
@@ -45,10 +45,10 @@ public class TileWebController {
 
     @ApiOperation("面向瓦片的点击查询")
     @GetMapping("/queryElements")
-    public Result<List<?>> queryElements(String bbox,Integer type,String layerName){
+    public Result queryElements(String bbox,Integer type,String layerName){
         List<?> list=tileService.queryElements(bbox,type,layerName);
 
-        return Result.ok();
+        return Result.of(list, 0, "操作成功");
     }
 
 

tile-web/src/main/java/cn/com/taiji/web/service/IEnterpriseService.java

@@ -0,0 +1,28 @@
+package cn.com.taiji.web.service;
+
+import cn.com.taiji.common.domain.PageResult;
+import cn.com.taiji.common.domain.Result;
+import cn.com.taiji.web.vo.DeviceVo;
+import cn.com.taiji.web.vo.EnterpriseVo;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.Map;
+
+public interface IEnterpriseService {
+
+    /**
+     * 根据企业类型、企业名称查询企业基本信息列表
+     * @param enterpriseVo
+     * @return
+     */
+
+    PageResult enterpriseQuery(EnterpriseVo enterpriseVo);
+
+    /**
+     * 根据圆心和半径查找周边企业设备
+     * @param deviceVo
+     * @return
+     */
+
+    Result deviceQuery(@RequestBody DeviceVo deviceVo);
+}

tile-web/src/main/java/cn/com/taiji/web/service/impl/EnterpriseServiceImpl.java

@@ -0,0 +1,118 @@
+package cn.com.taiji.web.service.impl;
+
+import cn.com.taiji.common.domain.PageResult;
+import cn.com.taiji.common.domain.Result;
+import cn.com.taiji.cql.service.IECqlService;
+import cn.com.taiji.web.config.EnterpriseConfig;
+import cn.com.taiji.web.service.IEnterpriseService;
+import cn.com.taiji.web.vo.DeviceVo;
+import cn.com.taiji.web.vo.EnterpriseVo;
+import lombok.extern.slf4j.Slf4j;
+import org.geotools.jdbc.JDBCDataStoreFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Service
+public class EnterpriseServiceImpl implements IEnterpriseService {
+
+    @Autowired
+    private EnterpriseConfig enterpriseConfig;
+
+    @Autowired
+    private IECqlService ecqlService;
+
+    @Override
+    public PageResult enterpriseQuery(EnterpriseVo enterpriseVo) {
+
+        //数据源
+        Map<String, Object> entDsParams = new HashMap<String, Object>();
+        entDsParams.put(JDBCDataStoreFactory.DATABASE.key, enterpriseConfig.getDsBaseName());
+        entDsParams.put(JDBCDataStoreFactory.DBTYPE.key, enterpriseConfig.getDbType());
+
+        entDsParams.put(JDBCDataStoreFactory.HOST.key, enterpriseConfig.getDsIp());
+        entDsParams.put(JDBCDataStoreFactory.PORT.key, enterpriseConfig.getDsPort());
+        entDsParams.put(JDBCDataStoreFactory.USER.key, enterpriseConfig.getDsUserName());
+        entDsParams.put(JDBCDataStoreFactory.PASSWD.key, enterpriseConfig.getDsPassword());
+        entDsParams.put("tableName", enterpriseConfig.getDsTableName());
+
+        //组装排序参数
+        Map<String, Object> sortParams = new HashMap<String, Object>();
+        sortParams.put("sort","asc");
+
+        //组装分页参数
+        Map<String, Object> pageParams = new HashMap<String, Object>();
+        pageParams.put("pageSize",enterpriseVo.getPageSize());
+        pageParams.put("pageNumber",enterpriseVo.getPageSize());
+
+        //组转cql查询条件
+        StringBuffer filterCql = new StringBuffer();
+        if(enterpriseVo.getEntName() !=null && !"".equals(enterpriseVo.getEntName())){
+
+            filterCql.append("(entName like '%"+enterpriseVo.getEntName()+"%')");
+
+        }
+
+        if(enterpriseVo.getEntType() !=null && !"".equals(enterpriseVo.getEntType())){
+
+            if(filterCql.length() >0){
+
+                filterCql.append(" and (entType = '"+enterpriseVo.getEntType()+"')");
+            }else{
+
+                filterCql.append(" (entType = '"+enterpriseVo.getEntType()+"')");
+            }
+
+        }
+
+        System.out.println("查询条件:"+filterCql.toString());
+
+        return ecqlService.cqlQuery4Mysql(entDsParams,filterCql.toString(),sortParams,pageParams);
+    }
+
+    @Override
+    public Result deviceQuery(DeviceVo deviceVo) {
+
+        //数据源
+        Map<String, Object> entDsParams = new HashMap<String, Object>();
+        entDsParams.put(JDBCDataStoreFactory.DATABASE.key, enterpriseConfig.getDsBaseName());
+        entDsParams.put(JDBCDataStoreFactory.DBTYPE.key, enterpriseConfig.getDbType());
+
+        entDsParams.put(JDBCDataStoreFactory.HOST.key, enterpriseConfig.getDsIp());
+        entDsParams.put(JDBCDataStoreFactory.PORT.key, enterpriseConfig.getDsPort());
+        entDsParams.put(JDBCDataStoreFactory.USER.key, enterpriseConfig.getDsUserName());
+        entDsParams.put(JDBCDataStoreFactory.PASSWD.key, enterpriseConfig.getDsPassword());
+        entDsParams.put("tableName", enterpriseConfig.getDsTableName());
+
+        //组转cql查询条件
+        StringBuffer filterCql = new StringBuffer();
+
+        String wkt = "POINT ("+deviceVo.getLon()+" "+deviceVo.getLat()+")";
+
+        filterCql.append("(DWITHIN(location," + wkt + ", "+deviceVo.getRadius()+", kilometers))");
+
+        if(deviceVo.getEntCode() !=null && !"".equals(deviceVo.getEntCode())){
+
+            if(filterCql.length() >0){
+
+                filterCql.append(" and (entCode = '"+deviceVo.getEntCode()+"')");
+            }else{
+
+                filterCql.append(" (entCode = '"+deviceVo.getEntCode()+"')");
+            }
+
+        }
+
+        System.out.println("查询条件:"+filterCql.toString());
+
+        PageResult pageResult = ecqlService.cqlQuery4Mysql(entDsParams,filterCql.toString(),null,null);
+
+        return Result.of(pageResult.getDatas().toString(),pageResult.getResp_code(),pageResult.getResp_msg());
+
+
+    }
+}

tile-web/src/main/java/cn/com/taiji/web/service/impl/GeoDataSourceServiceImpl.java

@@ -1,5 +1,6 @@
 package cn.com.taiji.web.service.impl;
 
+import cn.com.taiji.common.domain.PageResult;
 import cn.com.taiji.cql.model.GeoDataSource;
 import cn.com.taiji.cql.service.IECqlService;
 import cn.com.taiji.web.config.GeoConfig;
@@ -46,9 +47,11 @@ public class GeoDataSourceServiceImpl implements IGeoDataSourceService {
 
         Map<String, Object> sortParams = new HashMap<String, Object>();
 
-        List<Map<String, Object>> dataSourceList = ecqlService.cqlQuery(mapParams,layerCodeCql,sortParams);
+        PageResult pageResult = ecqlService.cqlQuery4Mysql(mapParams,layerCodeCql,sortParams,null);
 
-        if(dataSourceList.size() >0){
+        if(pageResult.getRecordCount() >0){
+
+            List<Map<String, Object>> dataSourceList = (List<Map<String, Object>>) pageResult.getDatas();
 
             GeoDataSource gds = JSONObject.parseObject(JSONObject.toJSONString(dataSourceList.get(0)), GeoDataSource.class);
 

tile-web/src/main/java/cn/com/taiji/web/vo/DeviceVo.java

@@ -0,0 +1,28 @@
+package cn.com.taiji.web.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class DeviceVo implements Serializable {
+
+    /**
+     * 圆心经度
+     */
+    private double lon;
+    /**
+     * 圆心纬度
+     */
+    private double lat;
+
+    /**
+     * 半径(单位为千米)
+     */
+    private double radius;
+
+    /**
+     * 企业代码
+     */
+    private String entCode;
+}

tile-web/src/main/java/cn/com/taiji/web/vo/EnterpriseVo.java

@@ -0,0 +1,19 @@
+package cn.com.taiji.web.vo;
+
+import cn.com.taiji.common.domain.PageInfo;
+import lombok.Data;
+
+import java.io.Serializable;
+@Data
+public class EnterpriseVo extends PageInfo implements Serializable {
+
+    /**
+     * 企业类型
+     */
+    private String entType;
+
+    /**
+     * 企业名称
+     */
+    private String entName;
+}