解决冲突

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

@@ -178,8 +178,8 @@ public class IdxBizPvHealthIndexController extends BaseController {
 		map.put("value",idxBizPvWarningRecordList.stream().filter(e->e.getWarningName().equals("警告")).count());
 		warningNum.put("name","注意");
 		warningNum.put("value",idxBizPvWarningRecordList.stream().filter(e->e.getWarningName().equals("注意")).count());
-		pointNum.put("name","正常");
-		pointNum.put("value",total  - idxBizPvWarningRecordList.size());
+		pointNum.put("name","安全");
+		pointNum.put("value", Math.max((total - idxBizPvWarningRecordList.size()), 0));
 
 		List<Map<String,Object>> list = new ArrayList<>();
 		list.add(pointNum);

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizPvHealthIndexMapper.xml

@@ -134,6 +134,7 @@
                 AND b.POINT_NAME = #{POINTNAME}
             </if>
         </where>
+        group by INDEX_ADDRESS
         order by b.HEALTH_INDEX ASC
 
         limit ${current},${size}
@@ -185,6 +186,7 @@
                 AND b.POINT_NAME = #{POINTNAME}
             </if>
         </where>
+<!--        group by INDEX_ADDRESS-->
 
     </select>