修改首页报警信息

huimv-ql-farm/huimv-ql-environment/src/main/java/com/huimv/environment/task/WarningParameterTask.java

@@ -1,108 +1,108 @@
 package com.huimv.environment.task;
 
-import com.huimv.environment.entity.*;
-import com.huimv.environment.repo.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
-
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author yinhao
- * @date 2021/5/28 10:34
- */
-@Configuration
-@EnableScheduling
-public class WarningParameterTask {
-
-    @Autowired
-    private ConfigEntityRepo configEntityRepo;
-
-    @Autowired
-    private WarningParameterRepository warningParameterRepository;
-
-    //本地参数
-    @Autowired
-    private IndexParameter2EntityRepo indexParameter2EntityRepo;
-    //erp 参数
-    @Autowired
-    private IndexParameterEntityRepo indexParameterEntityRepo;
-
-    @Autowired
-    private WarningInfoEntityRepo warningInfoEntityRepo;
-
-    @Scheduled(cron = "0 51 13 * * ?")
-    public void warningTask() {
-        List<ConfigEntity> all = configEntityRepo.findAll();
-        ConfigEntity configEntity = all.get(0);
-        String propertyValue = configEntity.getPropertyValue();
-
-        List<WarningParameter> warningParameterList = warningParameterRepository.findAll();
-
-        if ("true".equals(propertyValue)) {
-            List<IndexParameter2Entity> localList = indexParameter2EntityRepo.findAll();
-            List<IndexParameter2Entity> collect = localList.stream()
-                    .filter(localEntity -> warningParameterList.stream()
-                            .anyMatch(w -> w.getParameterName().equals(localEntity.getName())))
-                    .collect(Collectors.toList());
-
-            List<IndexParameter2Entity> collect1 = collect.stream().filter(s -> warningParameterList.stream().anyMatch(warningParameter -> warningParameter.getParameterName().equals(s.getName()) && warningParameter.getThresholdValue() < Double.parseDouble(s.getData())))
-                    .collect(Collectors.toList());
-
-            for (IndexParameter2Entity indexParameter2Entity : collect1) {
-                WarningInfoEntity warningInfoEntity = new WarningInfoEntity();
-                warningInfoEntity.setUploadTime(new Date());
-                warningInfoEntity.setType(indexParameter2Entity.getName() + "参数小于阈值，请核查！");
-                warningInfoEntityRepo.save(warningInfoEntity);
-            }
-        }
-
-        if ("false".equals(propertyValue)) {
-            List<IndexParameterEntity> localList = indexParameterEntityRepo.findAll();
-            List<IndexParameterEntity> collect = localList.stream()
-                    .filter(localEntity -> warningParameterList.stream()
-                            .anyMatch(w -> w.getParameterName().equals(localEntity.getName())))
-                    .collect(Collectors.toList());
-
-            List<IndexParameterEntity> collect1 = collect.stream().filter(s -> warningParameterList.stream().anyMatch(warningParameter -> warningParameter.getParameterName().equals(s.getName()) && warningParameter.getThresholdValue() < Double.parseDouble(s.getData())))
-                    .collect(Collectors.toList());
-
-            for (IndexParameterEntity indexParameter2Entity : collect1) {
-                WarningInfoEntity warningInfoEntity = new WarningInfoEntity();
-                warningInfoEntity.setUploadTime(new Date());
-                warningInfoEntity.setType(indexParameter2Entity.getName() + "参数小于阈值，请核查！");
-                warningInfoEntityRepo.save(warningInfoEntity);
-            }
-        }
-
-
-//            for (IndexParameter2Entity entity : collect) {
-//                for (WarningParameter warningParameter : warningParameterList) {
-//                    if (entity.getName().equals(warningParameter.getParameterName())) {
-//                        double data = Double.parseDouble(entity.getData());
-//                        if (data < warningParameter.getThresholdValue()) {
-//                            WarningInfoEntity warningInfoEntity = new WarningInfoEntity();
-//                            warningInfoEntity.setUploadTime(new Date());
-//                            warningInfoEntity.setType(warningParameter.getParameterName() + "参数小于阈值，请核查！");
-//                            warningInfoEntityRepo.save(warningInfoEntity);
-//                        }
-//                    }
-//                }
-//            }
+//import com.huimv.environment.entity.*;
+//import com.huimv.environment.repo.*;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.scheduling.annotation.EnableScheduling;
+//import org.springframework.scheduling.annotation.Scheduled;
+//
+//import java.util.Date;
+//import java.util.List;
+//import java.util.stream.Collectors;
+//
+///**
+// * <p>
+// *
+// * </p>
+// *
+// * @author yinhao
+// * @date 2021/5/28 10:34
+// */
+//@Configuration
+//@EnableScheduling
+//public class WarningParameterTask {
+//
+//    @Autowired
+//    private ConfigEntityRepo configEntityRepo;
+//
+//    @Autowired
+//    private WarningParameterRepository warningParameterRepository;
+//
+//    //本地参数
+//    @Autowired
+//    private IndexParameter2EntityRepo indexParameter2EntityRepo;
+//    //erp 参数
+//    @Autowired
+//    private IndexParameterEntityRepo indexParameterEntityRepo;
+//
+//    @Autowired
+//    private WarningInfoEntityRepo warningInfoEntityRepo;
+//
+//    @Scheduled(cron = "0 51 13 * * ?")
+//    public void warningTask() {
+//        List<ConfigEntity> all = configEntityRepo.findAll();
+//        ConfigEntity configEntity = all.get(0);
+//        String propertyValue = configEntity.getPropertyValue();
+//
+//        List<WarningParameter> warningParameterList = warningParameterRepository.findAll();
+//
 //        if ("true".equals(propertyValue)) {
 //            List<IndexParameter2Entity> localList = indexParameter2EntityRepo.findAll();
-//            for (IndexParameter2Entity entity : localList) {
-////                if (entity.getName())
+//            List<IndexParameter2Entity> collect = localList.stream()
+//                    .filter(localEntity -> warningParameterList.stream()
+//                            .anyMatch(w -> w.getParameterName().equals(localEntity.getName())))
+//                    .collect(Collectors.toList());
+//
+//            List<IndexParameter2Entity> collect1 = collect.stream().filter(s -> warningParameterList.stream().anyMatch(warningParameter -> warningParameter.getParameterName().equals(s.getName()) && warningParameter.getThresholdValue() < Double.parseDouble(s.getData())))
+//                    .collect(Collectors.toList());
+//
+//            for (IndexParameter2Entity indexParameter2Entity : collect1) {
+//                WarningInfoEntity warningInfoEntity = new WarningInfoEntity();
+//                warningInfoEntity.setUploadTime(new Date());
+//                warningInfoEntity.setType(indexParameter2Entity.getName() + "参数小于阈值，请核查！");
+//                warningInfoEntityRepo.save(warningInfoEntity);
+//            }
+//        }
+//
+//        if ("false".equals(propertyValue)) {
+//            List<IndexParameterEntity> localList = indexParameterEntityRepo.findAll();
+//            List<IndexParameterEntity> collect = localList.stream()
+//                    .filter(localEntity -> warningParameterList.stream()
+//                            .anyMatch(w -> w.getParameterName().equals(localEntity.getName())))
+//                    .collect(Collectors.toList());
+//
+//            List<IndexParameterEntity> collect1 = collect.stream().filter(s -> warningParameterList.stream().anyMatch(warningParameter -> warningParameter.getParameterName().equals(s.getName()) && warningParameter.getThresholdValue() < Double.parseDouble(s.getData())))
+//                    .collect(Collectors.toList());
+//
+//            for (IndexParameterEntity indexParameter2Entity : collect1) {
+//                WarningInfoEntity warningInfoEntity = new WarningInfoEntity();
+//                warningInfoEntity.setUploadTime(new Date());
+//                warningInfoEntity.setType(indexParameter2Entity.getName() + "参数小于阈值，请核查！");
+//                warningInfoEntityRepo.save(warningInfoEntity);
 //            }
-    }
-}
+//        }
+//
+//
+////            for (IndexParameter2Entity entity : collect) {
+////                for (WarningParameter warningParameter : warningParameterList) {
+////                    if (entity.getName().equals(warningParameter.getParameterName())) {
+////                        double data = Double.parseDouble(entity.getData());
+////                        if (data < warningParameter.getThresholdValue()) {
+////                            WarningInfoEntity warningInfoEntity = new WarningInfoEntity();
+////                            warningInfoEntity.setUploadTime(new Date());
+////                            warningInfoEntity.setType(warningParameter.getParameterName() + "参数小于阈值，请核查！");
+////                            warningInfoEntityRepo.save(warningInfoEntity);
+////                        }
+////                    }
+////                }
+////            }
+////        if ("true".equals(propertyValue)) {
+////            List<IndexParameter2Entity> localList = indexParameter2EntityRepo.findAll();
+////            for (IndexParameter2Entity entity : localList) {
+//////                if (entity.getName())
+////            }
+//    }
+//}
 
 

huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/task/WarningParameterTask.java

@@ -61,7 +61,7 @@ public class WarningParameterTask {
             for (IndexParameter2Entity indexParameter2Entity : collect1) {
                 WarningInfoEntity warningInfoEntity = new WarningInfoEntity();
                 warningInfoEntity.setUploadTime(new Date());
-                warningInfoEntity.setType(indexParameter2Entity.getName() + "参数小于阈值，请核查！");
+                warningInfoEntity.setType("本地数据的 " + indexParameter2Entity.getName() + " 参数小于阈值，请核查！");
                 warningInfoEntityRepo.save(warningInfoEntity);
             }
         }
@@ -80,29 +80,9 @@ public class WarningParameterTask {
             for (IndexParameterEntity indexParameter2Entity : collect1) {
                 WarningInfoEntity warningInfoEntity = new WarningInfoEntity();
                 warningInfoEntity.setUploadTime(new Date());
-                warningInfoEntity.setType(indexParameter2Entity.getName() + "参数小于阈值，请核查！");
+                warningInfoEntity.setType("ERP数据的 " + indexParameter2Entity.getName() + " 参数小于阈值，请核查！");
                 warningInfoEntityRepo.save(warningInfoEntity);
             }
         }
-
-
-//            for (IndexParameter2Entity entity : collect) {
-//                for (WarningParameter warningParameter : warningParameterList) {
-//                    if (entity.getName().equals(warningParameter.getParameterName())) {
-//                        double data = Double.parseDouble(entity.getData());
-//                        if (data < warningParameter.getThresholdValue()) {
-//                            WarningInfoEntity warningInfoEntity = new WarningInfoEntity();
-//                            warningInfoEntity.setUploadTime(new Date());
-//                            warningInfoEntity.setType(warningParameter.getParameterName() + "参数小于阈值，请核查！");
-//                            warningInfoEntityRepo.save(warningInfoEntity);
-//                        }
-//                    }
-//                }
-//            }
-//        if ("true".equals(propertyValue)) {
-//            List<IndexParameter2Entity> localList = indexParameter2EntityRepo.findAll();
-//            for (IndexParameter2Entity entity : localList) {
-////                if (entity.getName())
-//            }
     }
 }