去掉动态表

src/main/java/com/steerinfo/dil/controller/DilNoticeController.java

@@ -153,43 +153,11 @@ public class DilNoticeController extends BaseRESTfulController {
                                                Integer pageNum,
                                                Integer pageSize,
                                                String con) {
-        if (mapValue==null){
-            mapValue=new HashMap<>();
-        }
-        //框计算
-        if (con != null) {
-            if (!"undefined".equals(con)) {
-                //设置要查询的索引名称
-                String index = "get_notice_list";
-                //获取查询结果
-                return success(esFeign.getConResult(mapValue, index, apiId, pageNum, pageSize, con));
-            }
-        }
-        //初始化过滤
-        List<Map<String, Object>> listTotal = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if (mapValue.size() == 0) {
-            //将查询结果存入索引中
-            listTotal = dilNoticeService.getNoticeList(null);
-            Map<String, Object> map = new HashMap<>();
-            //添加索引
-            map.put("index", "get_notice_list");
-            //添加id
-            map.put("indexId", "noticeId");
-            listTotal.add(map);
-            //新建索引
-            String s = JSON.toJSONString(listTotal);
-            esFeign.insertIndex(listTotal);
-            //删除
-            listTotal.remove(listTotal.size() - 1);
-        }
-        if (listTotal == null) {
-            listTotal = dilNoticeService.getNoticeList(mapValue);
-        }
+
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = dilNoticeService.getNoticeList(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, listTotal, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 

src/main/java/com/steerinfo/dil/controller/RmsGatepostController.java

@@ -69,41 +69,11 @@ public class RmsGatepostController extends BaseRESTfulController {
                                          Integer pageNum,
                                          Integer pageSize,
                                          String con) throws ParseException {
-        //框计算
-        if (con != null) {
-            if (!"undefined".equals(con)) {
-                //设置要查询的索引名称
-                String index = "get_gatepost_list";
-                //获取查询结果
-                return success(esFeign.getConResult(mapValue, index, apiId, pageNum, pageSize, con));
-            }
-        }
-        //初始化过滤
-        List<Map<String, Object>> listTotal = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if (mapValue.size() == 0) {
-            //将查询结果存入索引中
-            listTotal = rmsGatepostService.getGatepostList(null);
-            Map<String, Object> map = new HashMap<>();
-            //添加索引
-            map.put("index", "get_gatepost_list");
-            //添加id
-            map.put("indexId", "gatepostId");
-            listTotal.add(map);
-            //新建索引
-            String s = JSON.toJSONString(listTotal);
-            esFeign.insertIndex(listTotal);
-            //删除
-            listTotal.remove(listTotal.size() - 1);
-        }
-        if (listTotal == null) {
-            listTotal = rmsGatepostService.getGatepostList(mapValue);
-        }
 
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = rmsGatepostService.getGatepostList(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, listTotal, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 

src/main/java/com/steerinfo/dil/controller/RmsPersonnelController.java

@@ -69,40 +69,11 @@ public class RmsPersonnelController extends BaseRESTfulController {
                                           Integer pageSize,
                                           String con){
 
-        //框计算
-        if (con != null) {
-            if (!"undefined".equals(con)) {
-                //设置要查询的索引名称
-                String index = "get_personnel_list";
-                //获取查询结果
-                return success(esFeign.getConResult(mapValue, index, apiId, pageNum, pageSize, con));
-            }
-        }
-        //初始化过滤
-        List<Map<String, Object>> listTotal = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if (mapValue.size() == 0) {
-            //将查询结果存入索引中
-            listTotal = rmsPersonnelService.getPersonnelList(null);
-            Map<String, Object> map = new HashMap<>();
-            //添加索引
-            map.put("index", "get_personnel_list");
-            //添加id
-            map.put("indexId", "personnelId");
-            listTotal.add(map);
-            //新建索引
-            String s = JSON.toJSONString(listTotal);
-            esFeign.insertIndex(listTotal);
-            //删除
-            listTotal.remove(listTotal.size() - 1);
-        }
-        if (listTotal == null) {
-            listTotal = rmsPersonnelService.getPersonnelList(mapValue);
-        }
+
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = rmsPersonnelService.getPersonnelList(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId,listTotal,columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId,null,columnList);
         return success(data);
     }
 

src/main/java/com/steerinfo/dil/controller/RmsPierController.java

@@ -109,30 +109,8 @@ public class RmsPierController extends BaseRESTfulController {
                                  Integer pageSize,
                                  Integer apiId,
                                  String con){
-        if(con != null ){
-            if(!"undefined".equals(con)){
-                String index = "get_rmspier";
-                return success(esFeign.getConResult(mapVal,index,apiId,pageNum,pageSize,con));
-            }
-        }
-        List<Map<String,Object>> pierList = null;
-        if(mapVal.size() == 0){
-            //将查询结果存入索引中
-            pierList = rmsPierService.getPier(mapVal);
-            Map<String,Object>pierMap = new HashMap<>();
-            //添加索引
-            pierMap.put("index","get_rmspier");
-            //添加ID
-            pierMap.put("indexId","pierId");
-            pierList.add(pierMap);
-            //新建索引
-            esFeign.insertIndex(pierList);
-            //删除
-            pierList.remove(pierList.size()-1);
-        }
-        if(pierList == null){
-            pierList = rmsPierService.getPier(mapVal);
-        }
+
+        List<Map<String,Object>>   pierList = rmsPierService.getPier(mapVal);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = rmsPierService.getPier(mapVal);

src/main/java/com/steerinfo/dil/controller/RmsPortController.java

@@ -107,34 +107,11 @@ public class RmsPortController extends BaseRESTfulController {
                                          Integer pageSize,
                                          Integer apiId,
                                          String con){
-        if (con != null) {
-            if(!"undefined".equals(con)){
-                String index = "get_rms_port";
-                return success(esFeign.getConResult(mapVal,index,apiId,pageNum,pageSize,con));
-            }
-        }
-        List<Map<String,Object>>portList = null;
-        if(mapVal.size() ==0 ){
-            //将查询结果存入索引中
-            portList = rmsPortService.getPort(mapVal);
-            Map<String,Object>portMap = new HashMap<>();
-            //添加索引
-            portMap.put("index","get_rms_port");
-            //添加ID
-            portMap.put("indexId","portId");
-            portList.add(portMap);
-            //新建索引
-            esFeign.insertIndex(portList);
-            //删除
-            portList.remove(portList.size()-1);
-        }
-        if(portList == null){
-            portList = rmsPortService.getPort(mapVal);
-        }
+
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = rmsPortService.getPort(mapVal);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, portList, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 

src/main/java/com/steerinfo/dil/controller/RmsPortStorageYard.java

@@ -114,34 +114,11 @@ public class RmsPortStorageYard extends BaseRESTfulController {
                                  Integer pageSize,
                                  Integer apiId,
                                      String con){
-        if(con != null) {
-            if(!"undefined".equals(con)){
-                String index = "get_rms_portyard";
-                return success(esFeign.getConResult(mapVal,index,apiId,pageNum,pageSize,con));
-            }
-        }
-        List<Map<String,Object>> portYardlist = null;
-        if(mapVal.size() == 0){
-            //将查询结果存入索引中
-            portYardlist = rmsPortStorageYardService.getPortYard(mapVal);
-            Map<String,Object>portYardMap = new HashMap<>();
-            //添加索引
-            portYardMap.put("index","get_rms_portyard");
-            //添加ID
-            portYardMap.put("indexId","portyardId");
-            portYardlist.add(portYardMap);
-            //新建索引
-            esFeign.insertIndex(portYardlist);
-            //删除
-            portYardlist.remove(portYardlist.size()-1);
-        }
-        if(portYardlist == null){
-            portYardlist = rmsPortStorageYardService.getPortYard(mapVal);
-        }
+
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = rmsPortStorageYardService.getPortYard(mapVal);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, portYardlist, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 

src/main/java/com/steerinfo/dil/controller/RmsShipperController.java

@@ -67,44 +67,12 @@ public class RmsShipperController extends BaseRESTfulController {
                                         Integer pageNum,
                                         Integer pageSize,
                                         String con){
-        if (mapValue==null){
-            mapValue=new HashMap<>();
-        }
-        //框计算
-        if (con != null) {
-            if (!"undefined".equals(con)) {
-                //设置要查询的索引名称
-                String index = "get_shipper_list";
-                //获取查询结果
-                return success(esFeign.getConResult(mapValue, index, apiId, pageNum, pageSize, con));
-            }
-        }
-        //初始化过滤
-        List<Map<String, Object>> listTotal = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if (mapValue.size() == 0) {
-            //将查询结果存入索引中
-            listTotal = rmsShipperService.getShipperList(null);
-            Map<String, Object> map = new HashMap<>();
-            //添加索引
-            map.put("index", "get_shipper_list");
-            //添加id
-            map.put("indexId", "shipperId");
-            listTotal.add(map);
-            //新建索引
-            String s = JSON.toJSONString(listTotal);
-            esFeign.insertIndex(listTotal);
-            //删除
-            listTotal.remove(listTotal.size() - 1);
-        }
-        if (listTotal == null) {
-            listTotal = rmsShipperService.getShipperList(mapValue);
-        }
+
+
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = rmsShipperService.getShipperList(mapValue);
-
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, listTotal, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 

src/main/java/com/steerinfo/dil/controller/RmsTruckCalculateController.java

@@ -133,39 +133,11 @@ public class RmsTruckCalculateController extends BaseRESTfulController {
                                                 Integer pageSize,
                                                 Integer apiId,
                                                 String con) {
-        if (mapValue==null){
-            mapValue=new HashMap<>();
-        }
-        //框计算
-        if (con != null) {
-            if (!"undefined".equals(con)) {
-                //设置要查询的索引名称
-                String index = "get_truck_calculate_list";
-                //获取查询结果
-                return success(esFeign.getConResult(mapValue, index, apiId, pageNum, pageSize, con));
-            }
-        }
+
         //初始化过滤
         List<Map<String, Object>> listTotal = null;
         //如果有条件查询则跳过初始化，和创建索引
-        if (mapValue.size() == 0) {
-            //将查询结果存入索引中
-            listTotal = rmsTruckCalculateService.getTruckCalculateList(null);
-            Map<String, Object> map = new HashMap<>();
-            //添加索引
-            map.put("index", "get_truck_calculate_list");
-            //添加id
-            map.put("indexId", "truckCalculateId");
-            listTotal.add(map);
-            //新建索引
-            String s = JSON.toJSONString(listTotal);
-            esFeign.insertIndex(listTotal);
-            //删除
-            listTotal.remove(listTotal.size() - 1);
-        }
-        if (listTotal == null) {
-            listTotal = rmsTruckCalculateService.getTruckCalculateList(mapValue);
-        }
+        listTotal = rmsTruckCalculateService.getTruckCalculateList(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = rmsTruckCalculateService.getTruckCalculateList(mapValue);

src/main/java/com/steerinfo/dil/controller/RmsWarehouseController.java

@@ -130,39 +130,8 @@ public class RmsWarehouseController extends BaseRESTfulController {
                                                 Integer pageSize,
                                                 Integer apiId,
                                                 String con) {
-        if (mapValue==null){
-            mapValue=new HashMap<>();
-        }
-        //框计算
-        if (con != null) {
-            if (!"undefined".equals(con)) {
-                //设置要查询的索引名称
-                String index = "get_warehouse_list";
-                //获取查询结果
-                return success(esFeign.getConResult(mapValue, index, apiId, pageNum, pageSize, con));
-            }
-        }
-        //初始化过滤
-        List<Map<String, Object>> listTotal = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if (mapValue.size() == 0) {
-            //将查询结果存入索引中
-            listTotal = rmsWarehouseService.getWarehouseList(null);
-            Map<String, Object> map = new HashMap<>();
-            //添加索引
-            map.put("index", "get_warehouse_list");
-            //添加id
-            map.put("indexId", "warehouseId");
-            listTotal.add(map);
-            //新建索引
-            String s = JSON.toJSONString(listTotal);
-            esFeign.insertIndex(listTotal);
-            //删除
-            listTotal.remove(listTotal.size() - 1);
-        }
-        if (listTotal == null) {
-            listTotal = rmsWarehouseService.getWarehouseList(mapValue);
-        }
+
+        List<Map<String,Object>>   listTotal = rmsWarehouseService.getWarehouseList(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = rmsWarehouseService.getWarehouseList(mapValue);