浏览代码

故障样本增加风速条件

chenminghua 2 年之前
父节点
当前提交
9dddc2ba75

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

@@ -32,9 +32,10 @@ public class CaseFaultAlgController {
                                    @RequestParam(value = "st", required = false) String st,
                                    @RequestParam(value = "et", required = false) String et,
                                    @RequestParam(value = "algcode", required = false) String algcode,
-                                   @RequestParam(value = "confirm", required = false) Boolean confirm){
+                                   @RequestParam(value = "confirm", required = false) Boolean confirm,
+                                   @RequestParam(value = "speed", required = false) String[] speed){
 
-        List<Casefaultalg> list = casefaultalgService.getAll(station, wtId, id, faultid, model, faultcode, st, et, algcode, confirm);
+        List<Casefaultalg> list = casefaultalgService.getAll(station, wtId, id, faultid, model, faultcode, st, et, algcode, confirm, speed);
         return JsonResult.successData(ResultCode.SUCCESS, list);
     }
 

+ 3 - 1
gyee-sample-impala/src/main/java/com/gyee/impala/service/impl/master/CasefaultalgServiceImpl.java

@@ -93,7 +93,7 @@ public class CasefaultalgServiceImpl extends ServiceImpl<CasefaultalgMapper, Cas
 
     @Override
     public List<Casefaultalg> getAll(String station, String wtId, String[] id, Long[] faultid, String[] model, String[] faultcode,
-                                     String st, String et, String algcode, Boolean confirm) {
+                                     String st, String et, String algcode, Boolean confirm, double minSpeed, double maxSpeed) {
         ExcludeQueryWrapper<Casefaultalg> wrapper = new ExcludeQueryWrapper<>();
         wrapper.eq("stationen", station)
                 .eq("windturbineid", wtId)
@@ -105,6 +105,8 @@ public class CasefaultalgServiceImpl extends ServiceImpl<CasefaultalgMapper, Cas
                 .le("endtime", et)
                 .eq("algcode", algcode)
                 .eq("confirm", confirm)
+                .ge("speed", minSpeed)
+                .le("speed", maxSpeed)
                 .orderByDesc("starttime");
         try {
             return baseMapper.selectList(wrapper);

+ 3 - 1
gyee-sample-impala/src/main/java/com/gyee/impala/service/master/CasefaultalgService.java

@@ -32,10 +32,12 @@ public interface CasefaultalgService extends IService<Casefaultalg> {
      * @param et       结束时间
      * @param algcode   算法名
      * @param confirm   是否筛选到结论样本库
+     * @param minSpeed  最小风速
+     * @param maxSpeed  最大风速
      * @return
      */
     List<Casefaultalg> getAll(String station, String wtId, String[] id, Long[] faultid, String[] model, String[] faultcode,
-                              String st, String et, String algcode, Boolean confirm);
+                              String st, String et, String algcode, Boolean confirm, double minSpeed, double maxSpeed);
 
 
     /**