修改大屏监控右下角柱状图问题

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/TDBigScreenAnalyseController.java

@@ -762,9 +762,33 @@ public class TDBigScreenAnalyseController extends BaseController implements Appl
 		jgMapResult.put("data", jgList);
 		jgMapResult.put("name", "警告");
 
-		List<Map<String, Object>> hashMaps = Arrays.asList(wxMapResult, zyMapResult, jgMapResult);
-		resultMap.put("axisData", list);
-		resultMap.put("seriesData", hashMaps);
+		//为了页面显示 此处只取前30条
+		if(list.size() > 30){
+			List<String> newAxisData = list.subList(0, 29);
+			Collections.reverse(newAxisData);
+			List<Integer> newWxList = wxList.subList(0, 29);
+			Collections.reverse(newWxList);
+			List<Integer> newZyList = zyList.subList(0, 29);
+			Collections.reverse(newZyList);
+			List<Integer> newJgList = jgList.subList(0, 29);
+			Collections.reverse(newJgList);
+			HashMap<String, Object> newWxMapResult = new HashMap<>();
+			newWxMapResult.put("data", newWxList);
+			newWxMapResult.put("name", "危险");
+			HashMap<String, Object> newZyMapResult = new HashMap<>();
+			newZyMapResult.put("data", newZyList);
+			newZyMapResult.put("name", "注意");
+			HashMap<String, Object> newJgMapResult = new HashMap<>();
+			newJgMapResult.put("data", newJgList);
+			newJgMapResult.put("name", "警告");
+			List<Map<String, Object>> hashMaps = Arrays.asList(newWxMapResult, newZyMapResult, newJgMapResult);
+			resultMap.put("axisData", newAxisData);
+			resultMap.put("seriesData", hashMaps);
+		}else {
+			List<Map<String, Object>> hashMaps = Arrays.asList(wxMapResult, zyMapResult, jgMapResult);
+			resultMap.put("axisData", list);
+			resultMap.put("seriesData", hashMaps);
+		}
 		return ResponseHelper.buildResponse(resultMap);
 	}
 

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/tdengine2/FanWarningRecord.xml

@@ -567,7 +567,7 @@
                 and b.arae like #{araeCode}
             </if>
         </where>
-       order  by  b.`sort` ASC
+       order  by  b.`sort` DESC
     </select>
 
     <select id="getAllEquipAlarmInfoByStation" resultType="map">