模板下载路径;测点元数据读取

gyee-sample-impala/src/main/java/com/gyee/impala/common/util/GyeeUtil.java

@@ -60,6 +60,34 @@ public class GyeeUtil {
         }
     }
 
+
+    /**
+     * 点前面加前缀
+     * NX_GD_NSSF_FJ_P1_L2_014_AI0034  =>  NSSFJ.NX_GD_NSSF_FJ_P1_L2_014_AI0034
+     * @param point
+     * @return
+     */
+    public static String covertPoint(String point){
+        if (StringUtils.isEmpty(point))
+            return null;
+
+        if (point.contains("."))
+            return point;
+        else if (point.contains("MHS"))
+            return "MHSFJ." + point;
+        else if (point.contains("NSS"))
+            return "NSSFJ." + point;
+        else if (point.contains("QS"))
+            return "QSFJ." + point;
+        else if (point.contains("SBQ"))
+            return "SBQFJ." + point;
+        else if (point.contains("XS"))
+            return "XSFJ." + point;
+        else
+            return null;
+    }
+
+
     /**
      * 模拟功率曲线
      * @param power  风机功率

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

@@ -16,6 +16,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.stream.Stream;
 
 
 /**
@@ -51,7 +52,8 @@ public class CaseFaultController {
                                String st, String et, String category, Long[] ids) {
 
         List<Casefault> list = casefaultService.getAll(station, model, widget, st, et, category, ids);
-        return JsonResult.successData(ResultCode.SUCCESS, list);
+        Stream<Casefault> collect = list.stream().filter(a -> StringUtils.isNotEmpty(a.getFaulttype()));
+        return JsonResult.successData(ResultCode.SUCCESS, collect);
     }
 
 

gyee-sample-impala/src/main/java/com/gyee/impala/service/custom/GoldenService.java

@@ -6,6 +6,7 @@ import com.gyee.impala.common.exception.CustomException;
 import com.gyee.impala.common.feign.RemoteServiceBuilder;
 import com.gyee.impala.common.result.ResultCode;
 import com.gyee.impala.common.util.DateUtil;
+import com.gyee.impala.common.util.GyeeUtil;
 import com.gyee.impala.model.custom.TsDoubleData;
 import com.gyee.impala.model.master.Caseperformance;
 import com.gyee.impala.model.master.Windturbinepoint;
@@ -49,9 +50,9 @@ public class GoldenService {
                 List<TsDoubleData> data = new ArrayList<>();
                 Map m = new HashMap();
                 if (interval <= 0) {
-                    data = remoteService.adapter().getHistoryRawAI(point, startTs, endTs);
+                    data = remoteService.adapter().getHistoryRawAI(GyeeUtil.covertPoint(point), startTs, endTs);
                 } else {
-                    data = remoteService.adapter().getHistorySnapAI(point, startTs, endTs, interval);
+                    data = remoteService.adapter().getHistorySnapAI(GyeeUtil.covertPoint(point), startTs, endTs, interval);
                 }
                 /**保留2位小数**/
                 data.stream().forEach(obj -> obj.setDoubleValue(new BigDecimal(obj.getDoubleValue()).setScale(2,   BigDecimal.ROUND_HALF_UP).doubleValue()));

gyee-sample-impala/src/main/resources/application.yaml

@@ -7,8 +7,8 @@ gyee:
   # 样本数据统计开始时间
   init-time: 2022-01-01 00:00:00
   # 故障样本数据导入模板路径
-  template-path-window: D://java//kudu//template//
-  template-path-linux: /home/gyee/kudu/template/
+  template-path-window: D://java//kudu//template/
+  template-path-linux: /home/gyee/fault_digonsis/services/template/
   # kudu的host
   kudu-host: 192.168.1.65
   # 故障诊断脚本路径