增加query\new2和query\byname2接口返回windturbineCode

warning-web/src/main/java/com/gyee/wisdom/alarm/sharding/controller/AlarmCountController.java

@@ -1,6 +1,7 @@
 package com.gyee.wisdom.alarm.sharding.controller;
 
 import com.gyee.wisdom.alarm.sharding.cache.AlarmInfoCache;
+import com.gyee.wisdom.alarm.sharding.cache.WindturbineCache;
 import com.gyee.wisdom.alarm.sharding.config.AjaxResult;
 import com.gyee.wisdom.alarm.sharding.entity.*;
 import com.gyee.wisdom.alarm.sharding.service.AlarmReportService;
@@ -37,6 +38,8 @@ public class AlarmCountController {
 
     @Autowired
     private AlarmReportService alarmReportService;
+    @Autowired
+    private WindturbineCache windturbineCache;
 
 
     @GetMapping(value = "/count/start")
@@ -209,8 +212,10 @@ public class AlarmCountController {
             List<AlarmStat1> alarmStat1s = alarmCountService.statAlarmCount1(stId, startDate, endDate);
             if(alarmStat1s!=null){
                 for(AlarmStat1 alarmStat1:alarmStat1s){
-                    Windturbine windturbine = windturbineService.selectWindturbineByWindturbineid(alarmStat1.getWindturbineId());
+                   // Windturbine windturbine = windturbineService.selectWindturbineByWindturbineid(alarmStat1.getWindturbineId());
+                    Windturbine windturbine = windturbineCache.getWindturbine(alarmStat1.getWindturbineId());
                     alarmStat1.setCode(windturbine.getCode());
+                    alarmStat1.setWindturbineCode(windturbine.getCode());
                 }
                 result.addAll(alarmStat1s);
             }

warning-web/src/main/java/com/gyee/wisdom/alarm/sharding/entity/AlarmStat.java

@@ -23,4 +23,6 @@ public class AlarmStat implements Serializable{
     //总时长
     private Double times;
 
+    private String windturbineCode;
+
 }

warning-web/src/main/java/com/gyee/wisdom/alarm/sharding/entity/AlarmStat1.java

@@ -1,6 +1,9 @@
 package com.gyee.wisdom.alarm.sharding.entity;
 
+import lombok.AccessLevel;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.io.Serializable;
 
@@ -25,4 +28,7 @@ public class AlarmStat1 implements Serializable{
 
     private String code;
 
+    private String windturbineCode;
+
+
 }

warning-web/src/main/java/com/gyee/wisdom/alarm/sharding/service/AlarmCountService.java

@@ -282,6 +282,7 @@ public class AlarmCountService extends ServiceImpl<AlarmCountMapper, AlarmCount>
                     String str = windturbine.getId();
                     if (str.equalsIgnoreCase(alarmStat.getWtnum())) {
                         alarmStat.setWtnumobj(windturbine);
+                        alarmStat.setWindturbineCode(windturbine.getCode());
                         break;
                     }
                 }