新增的指标 工业库实时数据处理 和 历史数据处理

slibra-admin/src/main/java/com/slibra/web/controller/business/HandleDataController.java

@@ -735,12 +735,14 @@ public class HandleDataController extends BaseController
      */
     @GetMapping("/updateGYKSomeFields")
     public String updateGYKSomeFields() {
+        //ToDo 更新工业库部分字段 xxxxxx
         //更新的某个指标
-        String[] queryTags = {"信义污水厂_除磷P04预测值_"};
+//        String[] queryTags = {"信义污水厂_除磷P04预测值_"};
+        String[] queryTags = {"信义污水厂一号鼓风机电流", "信义污水厂二号鼓风机电流", "信义污水厂三号鼓风机电流", "信义污水厂四号鼓风机电流", "信义污水厂五号鼓风机电流", "信义污水厂六号鼓风机电流", "信义污水厂XGS1_R_Value", "信义污水厂细格栅间_2号细格栅主机_运行信号", "信义污水厂细格栅间_3号细格栅主机_运行信号", "信义污水厂XGS4_R_Value", "信义污水厂细格栅间_5号细格栅主机_运行信号", "信义污水厂细格栅间_6号细格栅主机_运行信号", "信义污水厂内回流1#_Ia", "信义污水厂内回流2#_Ia", "信义污水厂内回流3#_Ia", "信义污水厂内回流4#_Ia", "信义污水厂内回流5#_Ia", "信义污水厂内回流6#_Ia", "信义污水厂PNBFPNB1_R_Value", "信义污水厂PNBFPNB2_R_Value", "信义污水厂SWCSYWNHLB1_R_Value", "信义污水厂SWCSYWNHLB2_R_Value", "信义污水厂升级1#空压机主机A相电流", "信义污水厂升级2#空压机主机A相电流", "信义污水厂升级3#空压机主机A相电流", "信义污水厂升级4#空压机主机A相电流"};
         //找到对应的数据，然后更新它
         // 给定时间段的起始时间和结束时间
         LocalDateTime startTime = LocalDateTime.parse("2022-07-01T00:00:00");
-        LocalDateTime endTime = LocalDateTime.parse("2024-04-25T09:00:01");
+        LocalDateTime endTime = LocalDateTime.parse("2025-04-03T10:00:01");
 
         // 每个小时的时间格式
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
@@ -820,6 +822,58 @@ public class HandleDataController extends BaseController
                     BigDecimal value = new BigDecimal(split[1]);
                     if ("信义污水厂_除磷P04预测值_".equals(type)) {
                         industry.setCLP04YCZ(value);//目前值更新此字段
+                    }else if ("信义污水厂一号鼓风机电流".equals(type)) {
+                        industry.setOneFjDl(value);
+                    }else if ("信义污水厂二号鼓风机电流".equals(type)) {
+                        industry.setTwoFjDl(value);
+                    }else if ("信义污水厂三号鼓风机电流".equals(type)) {
+                        industry.setThreeFjDl(value);
+                    }else if ("信义污水厂四号鼓风机电流".equals(type)) {
+                        industry.setFourFjDl(value);
+                    }else if ("信义污水厂五号鼓风机电流".equals(type)) {
+                        industry.setFiveFjDl(value);
+                    }else if ("信义污水厂六号鼓风机电流".equals(type)) {
+                        industry.setSixFjDl(value);
+                    }else if ("信义污水厂XGS1_R_Value".equals(type)) {
+                        industry.setOneXgsQt(value);
+                    }else if ("信义污水厂细格栅间_2号细格栅主机_运行信号".equals(type)) {
+                        industry.setTwoXgsQt(value);
+                    }else if ("信义污水厂细格栅间_3号细格栅主机_运行信号".equals(type)) {
+                        industry.setThreeXgsQt(value);
+                    }else if ("信义污水厂XGS4_R_Value".equals(type)) {
+                        industry.setFourXgsQt(value);
+                    }else if ("信义污水厂细格栅间_5号细格栅主机_运行信号".equals(type)) {
+                        industry.setFiveXgsQt(value);
+                    }else if ("信义污水厂细格栅间_6号细格栅主机_运行信号".equals(type)) {
+                        industry.setSixXgsQt(value);
+                    }else if ("信义污水厂内回流1#_Ia".equals(type)) {
+                        industry.setOneNhlbDl(value);
+                    }else if ("信义污水厂内回流2#_Ia".equals(type)) {
+                        industry.setTwoNhlbDl(value);
+                    }else if ("信义污水厂内回流3#_Ia".equals(type)) {
+                        industry.setThreeNhlbDl(value);
+                    }else if ("信义污水厂内回流4#_Ia".equals(type)) {
+                        industry.setFourNhlbDl(value);
+                    }else if ("信义污水厂内回流5#_Ia".equals(type)) {
+                        industry.setFiveNhlbDl(value);
+                    }else if ("信义污水厂内回流6#_Ia".equals(type)) {
+                        industry.setSixNhlbDl(value);
+                    }else if ("信义污水厂PNBFPNB1_R_Value".equals(type)) {
+                        industry.setOneCccpnbQt(value);
+                    }else if ("信义污水厂PNBFPNB2_R_Value".equals(type)) {
+                        industry.setTwoCccpnbQt(value);
+                    }else if ("信义污水厂SWCSYWNHLB1_R_Value".equals(type)) {
+                        industry.setOneSywndbQt(value);
+                    }else if ("信义污水厂SWCSYWNHLB2_R_Value".equals(type)) {
+                        industry.setTwoSywndbQt(value);
+                    }else if ("信义污水厂升级1#空压机主机A相电流".equals(type)) {
+                        industry.setOneSdclDl(value);
+                    }else if ("信义污水厂升级2#空压机主机A相电流".equals(type)) {
+                        industry.setTwoSdclDl(value);
+                    }else if ("信义污水厂升级3#空压机主机A相电流".equals(type)) {
+                        industry.setThreeSdclDl(value);
+                    }else if ("信义污水厂升级4#空压机主机A相电流".equals(type)) {
+                        industry.setFourSdclDl(value);
                     }
                     /*else if ("信义污水厂除磷加药瞬时流量".equals(type)) {
                         industry.setCLJYSSLL(value);
@@ -836,7 +890,33 @@ public class HandleDataController extends BaseController
                             TXinyiIndustry updateTXinyiIndustry = new TXinyiIndustry();
                             //赋值
                             updateTXinyiIndustry.setID(uniqueTXinyiIndustry.getID());
-                            updateTXinyiIndustry.setCLP04YCZ(industry.getCLP04YCZ());
+//                            updateTXinyiIndustry.setCLP04YCZ(industry.getCLP04YCZ());
+                            updateTXinyiIndustry.setOneFjDl(industry.getOneFjDl());
+                            updateTXinyiIndustry.setTwoFjDl(industry.getTwoFjDl());
+                            updateTXinyiIndustry.setThreeFjDl(industry.getThreeFjDl());
+                            updateTXinyiIndustry.setFourFjDl(industry.getFourFjDl());
+                            updateTXinyiIndustry.setFiveFjDl(industry.getFiveFjDl());
+                            updateTXinyiIndustry.setSixFjDl(industry.getSixFjDl());
+                            updateTXinyiIndustry.setOneXgsQt(industry.getOneXgsQt());
+                            updateTXinyiIndustry.setTwoXgsQt(industry.getTwoXgsQt());
+                            updateTXinyiIndustry.setThreeXgsQt(industry.getThreeXgsQt());
+                            updateTXinyiIndustry.setFourXgsQt(industry.getFourXgsQt());
+                            updateTXinyiIndustry.setFiveXgsQt(industry.getFiveXgsQt());
+                            updateTXinyiIndustry.setSixXgsQt(industry.getSixXgsQt());
+                            updateTXinyiIndustry.setOneNhlbDl(industry.getOneNhlbDl());
+                            updateTXinyiIndustry.setTwoNhlbDl(industry.getTwoNhlbDl());
+                            updateTXinyiIndustry.setThreeNhlbDl(industry.getThreeNhlbDl());
+                            updateTXinyiIndustry.setFourNhlbDl(industry.getFourNhlbDl());
+                            updateTXinyiIndustry.setFiveNhlbDl(industry.getFiveNhlbDl());
+                            updateTXinyiIndustry.setSixNhlbDl(industry.getSixNhlbDl());
+                            updateTXinyiIndustry.setOneCccpnbQt(industry.getOneCccpnbQt());
+                            updateTXinyiIndustry.setTwoCccpnbQt(industry.getTwoCccpnbQt());
+                            updateTXinyiIndustry.setOneSywndbQt(industry.getOneSywndbQt());
+                            updateTXinyiIndustry.setTwoSywndbQt(industry.getTwoSywndbQt());
+                            updateTXinyiIndustry.setOneSdclDl(industry.getOneSdclDl());
+                            updateTXinyiIndustry.setTwoSdclDl(industry.getTwoSdclDl());
+                            updateTXinyiIndustry.setThreeSdclDl(industry.getThreeSdclDl());
+                            updateTXinyiIndustry.setFourSdclDl(industry.getFourSdclDl());
                             //更新数据库
                             xinyiIndustryMapper.updateTXinyiIndustry(updateTXinyiIndustry);
                         }