diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByDayDataHandlerAdapter.java b/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByDayDataHandlerAdapter.java new file mode 100644 index 0000000..43b2b97 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByDayDataHandlerAdapter.java @@ -0,0 +1,89 @@ +package com.casic.missiles.modular.system.handler; + +import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.system.model.TableViewConfig; +import com.casic.missiles.modular.system.tools.DataSqlUtil; +import org.beetl.ext.fn.StringUtil; +import org.springframework.stereotype.Component; + +import java.text.SimpleDateFormat; +import java.util.*; + +/** + * @ClassName HttpDataHandler + * @Description 历年各类项目数量 + * @Author lwh + * @Date 2021/1/21 16:31 + * @Version 1.0 + */ +@Component +public class AlarmByDayDataHandlerAdapter extends AbstractDataHandlerAdapter { + @Override + public Object processData(TableViewConfig currView) { + + String[] params = currView.getParams(); + + String startTime = params[0]; + String endTime = params[1]; + List days = new ArrayList<>(); + List resultList = new ArrayList<>(); + try { + days = getDays(startTime, endTime); + } catch (Exception e) { + e.printStackTrace(); + } + + List> objectList = (List>) DataSqlUtil.processData(currView); + + if (ToolUtil.isNotEmpty(objectList)) { + for (Map objectMap : objectList) { + String date = objectMap.get("date") + ""; + if (!resultList.contains(date)) { + resultList.add(date); + } + } + } + for (String day : days) { + if (!resultList.contains(day)) { + Map objectMap1 = new HashMap<>(); + objectMap1.put("date", day); + objectMap1.put("value", 0); + objectList.add(objectMap1); + } + + } + + return objectList; + } + + public List getDays(String timeBegin, String timeEnd) throws Exception { + + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Date begin = sdf.parse(timeBegin); + Date end = sdf.parse(timeEnd); + List lDate = new ArrayList(); + lDate.add(begin); + Calendar calBegin = Calendar.getInstance(); + // 使用给定的 Date 设置此 Calendar 的时间 + calBegin.setTime(begin); + Calendar calEnd = Calendar.getInstance(); + // 使用给定的 Date 设置此 Calendar 的时间 + calEnd.setTime(end); + // 测试此日期是否在指定日期之后 + while (end.after(calBegin.getTime())) { + // 根据日历的规则，为给定的日历字段添加或减去指定的时间量 + calBegin.add(Calendar.DAY_OF_MONTH, 1); + lDate.add(calBegin.getTime()); + } + List timeStringList = new ArrayList<>(); + for (Date datePes : lDate) { + String format = sdf.format(datePes); + timeStringList.add(format); + } + + return timeStringList; + + } + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByDayDataHandlerAdapter.java b/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByDayDataHandlerAdapter.java new file mode 100644 index 0000000..43b2b97 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByDayDataHandlerAdapter.java @@ -0,0 +1,89 @@ +package com.casic.missiles.modular.system.handler; + +import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.system.model.TableViewConfig; +import com.casic.missiles.modular.system.tools.DataSqlUtil; +import org.beetl.ext.fn.StringUtil; +import org.springframework.stereotype.Component; + +import java.text.SimpleDateFormat; +import java.util.*; + +/** + * @ClassName HttpDataHandler + * @Description 历年各类项目数量 + * @Author lwh + * @Date 2021/1/21 16:31 + * @Version 1.0 + */ +@Component +public class AlarmByDayDataHandlerAdapter extends AbstractDataHandlerAdapter { + @Override + public Object processData(TableViewConfig currView) { + + String[] params = currView.getParams(); + + String startTime = params[0]; + String endTime = params[1]; + List days = new ArrayList<>(); + List resultList = new ArrayList<>(); + try { + days = getDays(startTime, endTime); + } catch (Exception e) { + e.printStackTrace(); + } + + List> objectList = (List>) DataSqlUtil.processData(currView); + + if (ToolUtil.isNotEmpty(objectList)) { + for (Map objectMap : objectList) { + String date = objectMap.get("date") + ""; + if (!resultList.contains(date)) { + resultList.add(date); + } + } + } + for (String day : days) { + if (!resultList.contains(day)) { + Map objectMap1 = new HashMap<>(); + objectMap1.put("date", day); + objectMap1.put("value", 0); + objectList.add(objectMap1); + } + + } + + return objectList; + } + + public List getDays(String timeBegin, String timeEnd) throws Exception { + + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Date begin = sdf.parse(timeBegin); + Date end = sdf.parse(timeEnd); + List lDate = new ArrayList(); + lDate.add(begin); + Calendar calBegin = Calendar.getInstance(); + // 使用给定的 Date 设置此 Calendar 的时间 + calBegin.setTime(begin); + Calendar calEnd = Calendar.getInstance(); + // 使用给定的 Date 设置此 Calendar 的时间 + calEnd.setTime(end); + // 测试此日期是否在指定日期之后 + while (end.after(calBegin.getTime())) { + // 根据日历的规则，为给定的日历字段添加或减去指定的时间量 + calBegin.add(Calendar.DAY_OF_MONTH, 1); + lDate.add(calBegin.getTime()); + } + List timeStringList = new ArrayList<>(); + for (Date datePes : lDate) { + String format = sdf.format(datePes); + timeStringList.add(format); + } + + return timeStringList; + + } + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByTypeDataHandlerAdapter.java b/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByTypeDataHandlerAdapter.java new file mode 100644 index 0000000..cb4d9a3 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByTypeDataHandlerAdapter.java @@ -0,0 +1,96 @@ +package com.casic.missiles.modular.system.handler; + +import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.system.model.TableViewConfig; +import com.casic.missiles.modular.system.tools.DataSqlUtil; +import org.springframework.stereotype.Component; + +import java.util.*; + +/** + * @ClassName HttpDataHandler + * @Description 历年状态项目数量 + * @Author lwh + * @Date 2021/1/21 16:31 + * @Version 1.0 + */ +@Component +public class AlarmByTypeDataHandlerAdapter extends AbstractDataHandlerAdapter { + + + private static String[] alarmArr = {"液位超限", "噪声超标", "井盖开启", "消防栓开启", "燃气浓度超标", "有害气体超标"}; + + @Override + public Object processData(TableViewConfig currView) { + + + Map mapObj = (Map) DataSqlUtil.processData(currView); + List> mapList = new ArrayList<>(); + + if (ToolUtil.isNotEmpty(mapObj)) { + + for (Map.Entry entry : mapObj.entrySet()) { + Map map = new HashMap<>(); + String mapKey = entry.getKey() + ""; + + switch (mapKey) { + case "rq": + map.put("type", "燃气浓度超标"); + map.put("value", entry.getValue()); + break; + case "ys": + map.put("type", "液位超限"); + map.put("value", entry.getValue()); + break; + case "gs": + map.put("type", "噪声超标"); + map.put("value", entry.getValue()); + break; + case "xfs": + map.put("type", "消防栓开启"); + map.put("value", entry.getValue()); + break; + case "jg": + map.put("type", "井盖开启"); + map.put("value", entry.getValue()); + break; + case "yh": + map.put("type", "有害气体超标"); + map.put("value", entry.getValue()); + break; + default: + break; + } + if (ToolUtil.isNotEmpty(map)) + mapList.add(map); + } + } else { + for (int i = 0; i < alarmArr.length; i++) { + Map map = new HashMap<>(); + map.put("value", 0); + map.put("type", alarmArr[i]); + mapList.add(map); + } + } + + return mapList; + } + + /** + * 参数处理 + * + * @param params 传入参数 + */ + private void processParams(String[] params) { + switch (params[0]) { + case "day": + if (params.length == 1) { + + } + break; + } + Calendar cal = Calendar.getInstance(); + + } + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByDayDataHandlerAdapter.java b/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByDayDataHandlerAdapter.java new file mode 100644 index 0000000..43b2b97 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByDayDataHandlerAdapter.java @@ -0,0 +1,89 @@ +package com.casic.missiles.modular.system.handler; + +import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.system.model.TableViewConfig; +import com.casic.missiles.modular.system.tools.DataSqlUtil; +import org.beetl.ext.fn.StringUtil; +import org.springframework.stereotype.Component; + +import java.text.SimpleDateFormat; +import java.util.*; + +/** + * @ClassName HttpDataHandler + * @Description 历年各类项目数量 + * @Author lwh + * @Date 2021/1/21 16:31 + * @Version 1.0 + */ +@Component +public class AlarmByDayDataHandlerAdapter extends AbstractDataHandlerAdapter { + @Override + public Object processData(TableViewConfig currView) { + + String[] params = currView.getParams(); + + String startTime = params[0]; + String endTime = params[1]; + List days = new ArrayList<>(); + List resultList = new ArrayList<>(); + try { + days = getDays(startTime, endTime); + } catch (Exception e) { + e.printStackTrace(); + } + + List> objectList = (List>) DataSqlUtil.processData(currView); + + if (ToolUtil.isNotEmpty(objectList)) { + for (Map objectMap : objectList) { + String date = objectMap.get("date") + ""; + if (!resultList.contains(date)) { + resultList.add(date); + } + } + } + for (String day : days) { + if (!resultList.contains(day)) { + Map objectMap1 = new HashMap<>(); + objectMap1.put("date", day); + objectMap1.put("value", 0); + objectList.add(objectMap1); + } + + } + + return objectList; + } + + public List getDays(String timeBegin, String timeEnd) throws Exception { + + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Date begin = sdf.parse(timeBegin); + Date end = sdf.parse(timeEnd); + List lDate = new ArrayList(); + lDate.add(begin); + Calendar calBegin = Calendar.getInstance(); + // 使用给定的 Date 设置此 Calendar 的时间 + calBegin.setTime(begin); + Calendar calEnd = Calendar.getInstance(); + // 使用给定的 Date 设置此 Calendar 的时间 + calEnd.setTime(end); + // 测试此日期是否在指定日期之后 + while (end.after(calBegin.getTime())) { + // 根据日历的规则，为给定的日历字段添加或减去指定的时间量 + calBegin.add(Calendar.DAY_OF_MONTH, 1); + lDate.add(calBegin.getTime()); + } + List timeStringList = new ArrayList<>(); + for (Date datePes : lDate) { + String format = sdf.format(datePes); + timeStringList.add(format); + } + + return timeStringList; + + } + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByTypeDataHandlerAdapter.java b/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByTypeDataHandlerAdapter.java new file mode 100644 index 0000000..cb4d9a3 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByTypeDataHandlerAdapter.java @@ -0,0 +1,96 @@ +package com.casic.missiles.modular.system.handler; + +import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.system.model.TableViewConfig; +import com.casic.missiles.modular.system.tools.DataSqlUtil; +import org.springframework.stereotype.Component; + +import java.util.*; + +/** + * @ClassName HttpDataHandler + * @Description 历年状态项目数量 + * @Author lwh + * @Date 2021/1/21 16:31 + * @Version 1.0 + */ +@Component +public class AlarmByTypeDataHandlerAdapter extends AbstractDataHandlerAdapter { + + + private static String[] alarmArr = {"液位超限", "噪声超标", "井盖开启", "消防栓开启", "燃气浓度超标", "有害气体超标"}; + + @Override + public Object processData(TableViewConfig currView) { + + + Map mapObj = (Map) DataSqlUtil.processData(currView); + List> mapList = new ArrayList<>(); + + if (ToolUtil.isNotEmpty(mapObj)) { + + for (Map.Entry entry : mapObj.entrySet()) { + Map map = new HashMap<>(); + String mapKey = entry.getKey() + ""; + + switch (mapKey) { + case "rq": + map.put("type", "燃气浓度超标"); + map.put("value", entry.getValue()); + break; + case "ys": + map.put("type", "液位超限"); + map.put("value", entry.getValue()); + break; + case "gs": + map.put("type", "噪声超标"); + map.put("value", entry.getValue()); + break; + case "xfs": + map.put("type", "消防栓开启"); + map.put("value", entry.getValue()); + break; + case "jg": + map.put("type", "井盖开启"); + map.put("value", entry.getValue()); + break; + case "yh": + map.put("type", "有害气体超标"); + map.put("value", entry.getValue()); + break; + default: + break; + } + if (ToolUtil.isNotEmpty(map)) + mapList.add(map); + } + } else { + for (int i = 0; i < alarmArr.length; i++) { + Map map = new HashMap<>(); + map.put("value", 0); + map.put("type", alarmArr[i]); + mapList.add(map); + } + } + + return mapList; + } + + /** + * 参数处理 + * + * @param params 传入参数 + */ + private void processParams(String[] params) { + switch (params[0]) { + case "day": + if (params.length == 1) { + + } + break; + } + Calendar cal = Calendar.getInstance(); + + } + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/handler/CountByYearDataHandlerAdapter.java b/casic-server/src/main/java/com/casic/missiles/modular/system/handler/CountByYearDataHandlerAdapter.java index 2fecf4d..d91f4ab 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/handler/CountByYearDataHandlerAdapter.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/handler/CountByYearDataHandlerAdapter.java @@ -8,6 +8,7 @@ import org.springframework.stereotype.Component; import java.math.BigDecimal; +import java.text.SimpleDateFormat; import java.util.*; /** @@ -22,7 +23,10 @@ @Override public Object processData(TableViewConfig currView) { -// String[] params =currView.getParams(); + String[] params = currView.getParams(); + String startTime = params[0]; + String endTime = params[1]; + String[] industryArr = {"建筑行业", "市政行业", "交通行业", "水利行业", "园林行业"}; List yearList = new ArrayList<>(); List> objectList = (List>) DataSqlUtil.processData(currView); List> mapList = new ArrayList<>(); @@ -54,24 +58,48 @@ mapList.add(dataMap); } } + + + for (int i = Integer.valueOf(startTime); i <= Integer.valueOf(endTime); i++) { + if (yearList.contains(i + "")) { + + for (int j = 0; j < industryArr.length; j++) { + for (Map objectMap : mapList) { + String year = objectMap.get("year") + ""; + if ((i + "").equals(year)) { + List> numList = (List>) objectMap.get("data"); + List types = new ArrayList<>(); + for (Map num : numList) { + types.add(num.get("type") + ""); + } + if (!types.contains(industryArr[j])) { + Map typeMap = new HashMap<>(); + typeMap.put("type", industryArr[j]); + typeMap.put("value", 0); + numList.add(typeMap); + } + } + } + } + // + } else { + Map dataMap = new HashMap<>(); + List> dataList = new ArrayList<>(); + dataMap.put("year", i); + for (int j = 0; j < industryArr.length; j++) { + Map map = new HashMap<>(); + map.put("value", 0); + map.put("type", industryArr[j]); + dataList.add(map); + } + dataMap.put("data", dataList); + mapList.add(dataMap); + } + } + return mapList; } - /** - * 参数处理 - * - * @param params 传入参数 - */ - private void processParams(String[] params) { - switch (params[0]) { - case "day": - if (params.length == 1) { - } - break; - } - Calendar cal = Calendar.getInstance(); - - } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByDayDataHandlerAdapter.java b/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByDayDataHandlerAdapter.java new file mode 100644 index 0000000..43b2b97 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByDayDataHandlerAdapter.java @@ -0,0 +1,89 @@ +package com.casic.missiles.modular.system.handler; + +import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.system.model.TableViewConfig; +import com.casic.missiles.modular.system.tools.DataSqlUtil; +import org.beetl.ext.fn.StringUtil; +import org.springframework.stereotype.Component; + +import java.text.SimpleDateFormat; +import java.util.*; + +/** + * @ClassName HttpDataHandler + * @Description 历年各类项目数量 + * @Author lwh + * @Date 2021/1/21 16:31 + * @Version 1.0 + */ +@Component +public class AlarmByDayDataHandlerAdapter extends AbstractDataHandlerAdapter { + @Override + public Object processData(TableViewConfig currView) { + + String[] params = currView.getParams(); + + String startTime = params[0]; + String endTime = params[1]; + List days = new ArrayList<>(); + List resultList = new ArrayList<>(); + try { + days = getDays(startTime, endTime); + } catch (Exception e) { + e.printStackTrace(); + } + + List> objectList = (List>) DataSqlUtil.processData(currView); + + if (ToolUtil.isNotEmpty(objectList)) { + for (Map objectMap : objectList) { + String date = objectMap.get("date") + ""; + if (!resultList.contains(date)) { + resultList.add(date); + } + } + } + for (String day : days) { + if (!resultList.contains(day)) { + Map objectMap1 = new HashMap<>(); + objectMap1.put("date", day); + objectMap1.put("value", 0); + objectList.add(objectMap1); + } + + } + + return objectList; + } + + public List getDays(String timeBegin, String timeEnd) throws Exception { + + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Date begin = sdf.parse(timeBegin); + Date end = sdf.parse(timeEnd); + List lDate = new ArrayList(); + lDate.add(begin); + Calendar calBegin = Calendar.getInstance(); + // 使用给定的 Date 设置此 Calendar 的时间 + calBegin.setTime(begin); + Calendar calEnd = Calendar.getInstance(); + // 使用给定的 Date 设置此 Calendar 的时间 + calEnd.setTime(end); + // 测试此日期是否在指定日期之后 + while (end.after(calBegin.getTime())) { + // 根据日历的规则，为给定的日历字段添加或减去指定的时间量 + calBegin.add(Calendar.DAY_OF_MONTH, 1); + lDate.add(calBegin.getTime()); + } + List timeStringList = new ArrayList<>(); + for (Date datePes : lDate) { + String format = sdf.format(datePes); + timeStringList.add(format); + } + + return timeStringList; + + } + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByTypeDataHandlerAdapter.java b/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByTypeDataHandlerAdapter.java new file mode 100644 index 0000000..cb4d9a3 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/handler/AlarmByTypeDataHandlerAdapter.java @@ -0,0 +1,96 @@ +package com.casic.missiles.modular.system.handler; + +import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.system.model.TableViewConfig; +import com.casic.missiles.modular.system.tools.DataSqlUtil; +import org.springframework.stereotype.Component; + +import java.util.*; + +/** + * @ClassName HttpDataHandler + * @Description 历年状态项目数量 + * @Author lwh + * @Date 2021/1/21 16:31 + * @Version 1.0 + */ +@Component +public class AlarmByTypeDataHandlerAdapter extends AbstractDataHandlerAdapter { + + + private static String[] alarmArr = {"液位超限", "噪声超标", "井盖开启", "消防栓开启", "燃气浓度超标", "有害气体超标"}; + + @Override + public Object processData(TableViewConfig currView) { + + + Map mapObj = (Map) DataSqlUtil.processData(currView); + List> mapList = new ArrayList<>(); + + if (ToolUtil.isNotEmpty(mapObj)) { + + for (Map.Entry entry : mapObj.entrySet()) { + Map map = new HashMap<>(); + String mapKey = entry.getKey() + ""; + + switch (mapKey) { + case "rq": + map.put("type", "燃气浓度超标"); + map.put("value", entry.getValue()); + break; + case "ys": + map.put("type", "液位超限"); + map.put("value", entry.getValue()); + break; + case "gs": + map.put("type", "噪声超标"); + map.put("value", entry.getValue()); + break; + case "xfs": + map.put("type", "消防栓开启"); + map.put("value", entry.getValue()); + break; + case "jg": + map.put("type", "井盖开启"); + map.put("value", entry.getValue()); + break; + case "yh": + map.put("type", "有害气体超标"); + map.put("value", entry.getValue()); + break; + default: + break; + } + if (ToolUtil.isNotEmpty(map)) + mapList.add(map); + } + } else { + for (int i = 0; i < alarmArr.length; i++) { + Map map = new HashMap<>(); + map.put("value", 0); + map.put("type", alarmArr[i]); + mapList.add(map); + } + } + + return mapList; + } + + /** + * 参数处理 + * + * @param params 传入参数 + */ + private void processParams(String[] params) { + switch (params[0]) { + case "day": + if (params.length == 1) { + + } + break; + } + Calendar cal = Calendar.getInstance(); + + } + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/handler/CountByYearDataHandlerAdapter.java b/casic-server/src/main/java/com/casic/missiles/modular/system/handler/CountByYearDataHandlerAdapter.java index 2fecf4d..d91f4ab 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/handler/CountByYearDataHandlerAdapter.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/handler/CountByYearDataHandlerAdapter.java @@ -8,6 +8,7 @@ import org.springframework.stereotype.Component; import java.math.BigDecimal; +import java.text.SimpleDateFormat; import java.util.*; /** @@ -22,7 +23,10 @@ @Override public Object processData(TableViewConfig currView) { -// String[] params =currView.getParams(); + String[] params = currView.getParams(); + String startTime = params[0]; + String endTime = params[1]; + String[] industryArr = {"建筑行业", "市政行业", "交通行业", "水利行业", "园林行业"}; List yearList = new ArrayList<>(); List> objectList = (List>) DataSqlUtil.processData(currView); List> mapList = new ArrayList<>(); @@ -54,24 +58,48 @@ mapList.add(dataMap); } } + + + for (int i = Integer.valueOf(startTime); i <= Integer.valueOf(endTime); i++) { + if (yearList.contains(i + "")) { + + for (int j = 0; j < industryArr.length; j++) { + for (Map objectMap : mapList) { + String year = objectMap.get("year") + ""; + if ((i + "").equals(year)) { + List> numList = (List>) objectMap.get("data"); + List types = new ArrayList<>(); + for (Map num : numList) { + types.add(num.get("type") + ""); + } + if (!types.contains(industryArr[j])) { + Map typeMap = new HashMap<>(); + typeMap.put("type", industryArr[j]); + typeMap.put("value", 0); + numList.add(typeMap); + } + } + } + } + // + } else { + Map dataMap = new HashMap<>(); + List> dataList = new ArrayList<>(); + dataMap.put("year", i); + for (int j = 0; j < industryArr.length; j++) { + Map map = new HashMap<>(); + map.put("value", 0); + map.put("type", industryArr[j]); + dataList.add(map); + } + dataMap.put("data", dataList); + mapList.add(dataMap); + } + } + return mapList; } - /** - * 参数处理 - * - * @param params 传入参数 - */ - private void processParams(String[] params) { - switch (params[0]) { - case "day": - if (params.length == 1) { - } - break; - } - Calendar cal = Calendar.getInstance(); - - } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/handler/ProjectCountDataHandlerAdapter.java b/casic-server/src/main/java/com/casic/missiles/modular/system/handler/ProjectCountDataHandlerAdapter.java index 9e4963e..683faa5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/handler/ProjectCountDataHandlerAdapter.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/handler/ProjectCountDataHandlerAdapter.java @@ -46,7 +46,7 @@ map.put("total",Double.valueOf(value1)); map.put("radio",radio); - return ResponseData.success(map); + return map; } /**