多线程优化，小时均值修改

src/main/java/com/cn/esermis/dpld/business/MonitorBusiness.java

@@ -79,7 +79,7 @@ public class MonitorBusiness {
         List<CP> cp = factorModel.getCP();
         log.info("入库数据：{}", msg);
         try {
-            if (factorModel.getST().equals(Constant.ST_AIR)) {
+            if (!cp.isEmpty() && factorModel.getST().equals(Constant.ST_AIR)) {
                 // 气体检测
                 if (factorModel.getCN().equals(Constant.MINUTE)) {
                     // 分钟数据入库

src/main/java/com/cn/esermis/server/Consumer.java

@@ -59,26 +59,26 @@ public class Consumer {
             } else {
                 tolot++;
                 int finalTolot = tolot;
-                Object mge = redisQueueService.receiveMessage(Constant.SERVER);
-                try {
-                    System.out.println("消费消息------------：第（" + finalTolot + "）条");
-                    JSONObject jsonObject = (JSONObject) JSON.toJSON(mge);
-                    monitorBusiness.inboundOperations(jsonObject);
-                } catch (Exception e) {
-                    redisQueueService.sendMessage(Constant.RECEIVEREPEAT, mge);
-                    Thread.currentThread().interrupt();
-                }
-//                executor.submit(() -> {
-//                    Object mge = redisQueueService.receiveMessage(Constant.SERVER);
-//                    try {
-//                        System.out.println("消费消息------------：第（" + finalTolot + "）条");
-//                        JSONObject jsonObject = (JSONObject) JSON.toJSON(mge);
-//                        monitorBusiness.inboundOperations(jsonObject);
-//                    } catch (Exception e) {
-//                        redisQueueService.sendMessage(Constant.RECEIVEREPEAT, mge);
-//                        Thread.currentThread().interrupt();
-//                    }
-//                });
+//                Object mge = redisQueueService.receiveMessage(Constant.SERVER);
+//                try {
+//                    System.out.println("消费消息------------：第（" + finalTolot + "）条");
+//                    JSONObject jsonObject = (JSONObject) JSON.toJSON(mge);
+//                    monitorBusiness.inboundOperations(jsonObject);
+//                } catch (Exception e) {
+//                    redisQueueService.sendMessage(Constant.RECEIVEREPEAT, mge);
+//                    Thread.currentThread().interrupt();
+//                }
+                executor.submit(() -> {
+                    Object mge = redisQueueService.receiveMessage(Constant.SERVER);
+                    try {
+                        System.out.println("消费消息------------：第（" + finalTolot + "）条");
+                        JSONObject jsonObject = (JSONObject) JSON.toJSON(mge);
+                        monitorBusiness.inboundOperations(jsonObject);
+                    } catch (Exception e) {
+                        redisQueueService.sendMessage(Constant.RECEIVEREPEAT, mge);
+                        Thread.currentThread().interrupt();
+                    }
+                });
             }
         }
 

src/main/resources/static/mybatis/DataAcquisitionInstrumentMapper.xml

@@ -9,7 +9,7 @@
                a.outlet_code outletCode,
                c.factor `factor`,
                a.mn_code `mnCode`,
-               c.range_str `range`,
+               c.hours_avg `range`,
                a.company_code `companyCode`,
                a.department_code `departmentCode`
         from data_acquisition_instrument a