|
@@ -6,6 +6,7 @@ import cn.com.taiji.cql.model.GeoDataSource;
|
|
|
import cn.com.taiji.cql.service.IECqlService;
|
|
|
import cn.com.taiji.web.config.EnterpriseConfig;
|
|
|
import cn.com.taiji.web.model.DeviceInfo;
|
|
|
+import cn.com.taiji.web.model.EnterpriseInfo;
|
|
|
import cn.com.taiji.web.model.StaticsInfo;
|
|
|
import cn.com.taiji.web.service.IEnterpriseService;
|
|
|
import cn.com.taiji.web.vo.DeviceVo;
|
|
@@ -55,7 +56,7 @@ public class EnterpriseServiceImpl implements IEnterpriseService {
|
|
|
pageParams.put("pageNumber",enterpriseVo.getPageNumber());
|
|
|
|
|
|
Map<String, Object> sortParams = new HashMap<String, Object>();
|
|
|
- sortParams.put("id","desc");
|
|
|
+ sortParams.put("qymc","asc");
|
|
|
|
|
|
//组转cql查询条件
|
|
|
StringBuffer filterCql = new StringBuffer();
|
|
@@ -237,6 +238,7 @@ public class EnterpriseServiceImpl implements IEnterpriseService {
|
|
|
return Result.of(staticsInfo,0,"操作成功!");
|
|
|
}
|
|
|
|
|
|
+ //设备距离排序器
|
|
|
class DeviceComparator implements Comparator<DeviceInfo>{
|
|
|
|
|
|
@Override
|
|
@@ -245,4 +247,16 @@ public class EnterpriseServiceImpl implements IEnterpriseService {
|
|
|
return o1.getDistance().compareTo(o2.getDistance());
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ //企业名称顺序排序器
|
|
|
+ class EntNameComparator implements Comparator<EnterpriseInfo>{
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public int compare(EnterpriseInfo o1, EnterpriseInfo o2) {
|
|
|
+
|
|
|
+ return o1.getQymc().compareTo(o2.getQymc());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
}
|