case/faultalg/list前端接口修复

gyee-sample-impala/src/main/java/com/gyee/impala/controller/diagnose/WindspeedforecastshorttermController.java

@@ -64,9 +64,6 @@ public class WindspeedforecastshorttermController {
         }
         Date dateStart = DateUtil.str2DateTime(starttime);
         Date dateEnd = DateUtil.str2DateTime(endtime);
-        if(dateEnd.before(dateStart) || dateEnd.after(DateUtil.today0am())){
-            return JsonResult.error(1007, "时间超出范围");
-        }
         if(timescale==null) timescale = 0;
         return windspeedforecastshorttermService.getContrast(stationid,dateStart,dateEnd,timescale);
     }

gyee-sample-impala/src/main/java/com/gyee/impala/controller/sample/cases/CaseFaultAlgController.java

@@ -24,7 +24,7 @@ public class CaseFaultAlgController {
 
     @GetMapping("/faultalg/list")
     public JSONObject faultAlgList(@RequestParam(value = "station", required = false) String station,
-                                   @RequestParam(value = "windturbindid", required = false) String wtId,
+                                   @RequestParam(value = "windturbineid", required = false) String wtId,
                                    @RequestParam(value = "id", required = false) String[] id,
                                    @RequestParam(value = "faultid", required = false) Long[] faultid,
                                    @RequestParam(value = "model", required = false) String[] model,
@@ -33,12 +33,12 @@ public class CaseFaultAlgController {
                                    @RequestParam(value = "et", required = false) String et,
                                    @RequestParam(value = "algcode", required = false) String algcode,
                                    @RequestParam(value = "confirm", required = false) Boolean confirm,
-                                   @RequestParam(value = "minSpeed", required = false) double minSpeed,
-                                   @RequestParam(value = "maxSpeed", required = false) double maxSpeed,
-                                   @RequestParam(value = "minFaultTime", required = false) double minFaultTime,
-                                   @RequestParam(value = "maxFaultTime", required = false) double maxFaultTime,
-                                   @RequestParam(value = "minTemperature", required = false) double minTemperature,
-                                   @RequestParam(value = "maxTemperature", required = false) double maxTemperature){
+                                   @RequestParam(value = "minSpeed", required = false) Double minSpeed,
+                                   @RequestParam(value = "maxSpeed", required = false) Double maxSpeed,
+                                   @RequestParam(value = "minFaultTime", required = false) Double minFaultTime,
+                                   @RequestParam(value = "maxFaultTime", required = false) Double maxFaultTime,
+                                   @RequestParam(value = "minTemperature", required = false) Double minTemperature,
+                                   @RequestParam(value = "maxTemperature", required = false) Double maxTemperature){
 
         List<Casefaultalg> list = casefaultalgService.getAll(station, wtId, id, faultid, model, faultcode, st, et, algcode, confirm,
                 minSpeed, maxSpeed, minFaultTime, maxFaultTime, minTemperature, maxTemperature);

gyee-sample-impala/src/main/java/com/gyee/impala/service/impl/master/WindspeedforecastshorttermServiceImpl.java

@@ -18,7 +18,6 @@ import com.gyee.impala.model.master.Windspeedforecastspshortterm;
 import com.gyee.impala.service.master.IWindspeedforecastshorttermService;
 import org.apache.kudu.client.*;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -98,7 +97,6 @@ public class WindspeedforecastshorttermServiceImpl extends ServiceImpl<Windspeed
     }
 
     @Override
-    @Cacheable("windspeedforecastcontrast")
     public JSONObject getContrast(String stationid, Date starttime, Date endtime, int timescale) {
         Date dateStartQntq = DateUtil.dateTimeAddYear(starttime,-1);
         Date dateEndQntq = DateUtil.dateTimeAddYear(endtime,-1);