解决冲突

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/DemoController.java

@@ -109,10 +109,10 @@ public class DemoController extends BaseController {
 
             maps2.put("createdTime", "2023-07-05 18:30:26");
             maps2.put("unit", monitorFanIndicator.getUnit());
-            maps2.put("value", null);
-            maps2.put("valueLabel",null );
-            maps2.put("traceId", null);
-
+            maps2.put("value", "");
+            maps2.put("valueLabel","" );
+            maps2.put("traceId", "");
+            maps2.put("equipmentIndexName", monitorFanIndicator.getIndicator());
             maps2.put("equipmentNumber", monitorFanIndicator.getEquipmentNumber());
             maps2.put("frontModule", monitorFanIndicator.getFrontModule());
             maps2.put("systemType", monitorFanIndicator.getSystemType());

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitoringMapController.java

@@ -50,7 +50,7 @@ public class MonitoringMapController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "获取社会贡献")
     @GetMapping("/getTotalSocialContribution")
-    public ResponseModel<List<SocialContributionDto>> getTotalSocialContribution() {
-        return ResponseHelper.buildResponse(monitoringServiceImpl.getTotalSocialContribution());
+    public void getTotalSocialContribution() {
+//        return ResponseHelper.buildResponse(monitoringServiceImpl.getTotalSocialContribution());
     }
 }