1

src/main/java/com/fdkankan/fusion/service/impl/DataService.java

@@ -11,10 +11,7 @@ import com.fdkankan.fusion.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -152,7 +149,7 @@ public class DataService implements IDataService {
         List<Long> cameraIds = tmCameras.stream().map(TmCamera::getFdCameraId).collect(Collectors.toList());
         List<DataGroupVo> groupVoList =  scenePlusService.groupByType(param,cameraIds);
 
-        HashMap<String,Long> countMap = new HashMap<>();
+        TreeMap<String,Long> countMap = new TreeMap<>();
         for (DataGroupVo dataGroupVo : groupVoList) {
             String key = CameraUtil.getCameraNameByType(Integer.valueOf(dataGroupVo.getGroupKey()));
             countMap.merge(key, dataGroupVo.getDataCount(), Long::sum);
@@ -172,7 +169,7 @@ public class DataService implements IDataService {
     @Override
     public Object FireTrend(DataParam param) {
         List<String> monthdateList = DateUtils.getMonthdateList(param.getStartTime(), param.getEndTime());
-        HashMap<String,Long> countMap = new HashMap<>();
+        TreeMap<String,Long> countMap = new TreeMap<>();
         monthdateList.forEach(e -> countMap.put(e,0L));
 
         List<DataGroupVo> groupVoList = tmProjectService.groupByMonth(param,tmDepartmentService.getDeptIds());
@@ -188,7 +185,7 @@ public class DataService implements IDataService {
     @Override
     public Object FirePlaceTrend(DataParam param) {
         List<DataGroupVo> groupVoList = tmProjectService.groupByPlace(param,this.getSonDeptIds());
-        HashMap<String,Long> countMap = new HashMap<>();
+        TreeMap<String,Long> countMap = new TreeMap<>();
         for (String key : DataUtil.firePlace) {
             countMap.put(key,0L);
         }
@@ -203,7 +200,7 @@ public class DataService implements IDataService {
     @Override
     public Object FireReasonTrend(DataParam param) {
         List<DataGroupVo> groupVoList = tmProjectService.groupByReason(param,this.getSonDeptIds());
-        HashMap<String,Long> countMap = new HashMap<>();
+        TreeMap<String,Long> countMap = new TreeMap<>();
         for (String key : DataUtil.fireReason) {
             countMap.put(key,0L);
         }
@@ -215,7 +212,7 @@ public class DataService implements IDataService {
     }
 
 
-    private List<DataGroupVo> getListByMap( HashMap<String,Long> countMap ){
+    private List<DataGroupVo> getListByMap( TreeMap<String,Long> countMap ){
         List<DataGroupVo> dataGroupVos = new ArrayList<>();
         for (String key : countMap.keySet()) {
             DataGroupVo vo = new DataGroupVo();