修改大屏接口提交

data-collect-server/src/main/java/com/zq/datacollect/controller/BigScreenController.java

@@ -23,6 +23,13 @@ public class BigScreenController {
     private BigScreenService bigScreenService;
     private BigScreenService bigScreenService;
 
 
 
 
+    @ApiOperation("总数据量")
+    @GetMapping(value = "/getDataAll")
+    public ResultVo getDataAll() throws SQLException {
+        return ResultVo.success(bigScreenService.getDataAll());
+    }
+
+
     @ApiOperation("根据汇聚数据列表")
     @ApiOperation("根据汇聚数据列表")
     @GetMapping(value = "/getCollectList")
     @GetMapping(value = "/getCollectList")
     public ResultVo getCollectList() {
     public ResultVo getCollectList() {

data-collect-server/src/main/java/com/zq/datacollect/service/BigScreenService.java

@@ -52,4 +52,6 @@ public interface BigScreenService {
     Object getJswpajlb(String diqu,String pcNo) throws SQLException;
     Object getJswpajlb(String diqu,String pcNo) throws SQLException;
 
 
     Object getGywtxajNum(String diqu, String pcNo) throws SQLException;
     Object getGywtxajNum(String diqu, String pcNo) throws SQLException;
+
+    Object getDataAll() throws SQLException;
 }
 }

data-collect-server/src/main/java/com/zq/datacollect/service/impl/BigScreenServiceImpl.java

@@ -188,28 +188,30 @@ public class BigScreenServiceImpl implements BigScreenService {
 
 
     @Override
     @Override
     public Object getAllCount() throws SQLException {
     public Object getAllCount() throws SQLException {
-        List<Object> objects = new ArrayList<>();
-        List<DataCollectSetting> collectList = getCollectList();
-        for (DataCollectSetting list : collectList) {
-            Map<String, Object> dataMap = new HashMap<>();
-            String toTable = list.getToTable();
-            Map<String, Object> data = new HashMap<>();
-            data.put("queryName", "获取检察院数据统计");
-            data.put("toTable", toTable);
-            List<Map<String, Object>> mapList = CommonQuery(data);
-
-            String dataCount = null;
-            for (Map<String, Object> map : mapList) {
-                dataCount = map.get("dataCount").toString();
-            }
-            dataMap.put("dataId", list.getId());
-            dataMap.put("dataType", list.getDataType());
-            dataMap.put("TaskName", list.getTaskName());
-            dataMap.put("dataCount", dataCount);
-            objects.add(dataMap);
-        }
-
-        return objects;
+//        List<Object> objects = new ArrayList<>();
+//        List<DataCollectSetting> collectList = getCollectList();
+//        for (DataCollectSetting list : collectList) {
+//            Map<String, Object> dataMap = new HashMap<>();
+//            String toTable = list.getToTable();
+//            Map<String, Object> data = new HashMap<>();
+//            data.put("queryName", "获取检察院数据统计");
+//            data.put("toTable", toTable);
+//            List<Map<String, Object>> mapList = CommonQuery(data);
+//
+//            String dataCount = null;
+//            for (Map<String, Object> map : mapList) {
+//                dataCount = map.get("dataCount").toString();
+//            }
+//            dataMap.put("dataId", list.getId());
+//            dataMap.put("dataType", list.getDataType());
+//            dataMap.put("TaskName", list.getTaskName());
+//            dataMap.put("dataCount", dataCount);
+//            objects.add(dataMap);
+//        }
+        Map<String, Object> body = new HashMap<>();
+        body.put("queryName", "数据来源");
+        List<Map<String, Object>> mapList1 = CommonQuery(body);
+        return mapList1;
     }
     }
 
 
 
 
@@ -582,4 +584,12 @@ public class BigScreenServiceImpl implements BigScreenService {
         return mapList;
         return mapList;
     }
     }
 
 
+    @Override
+    public Object getDataAll() throws SQLException {
+        Map<String, Object> body = new HashMap<>();
+        body.put("queryName", "数据总量");
+        List<Map<String, Object>> mapList =CommonQuery(body);
+        return mapList;
+    }
+
 }
 }