代码调整

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

@@ -11,7 +11,6 @@ import com.slibra.business.mapper.*;
 import com.slibra.common.core.domain.TXinyiDaily;
 import com.slibra.common.core.controller.BaseController;
 import com.slibra.common.utils.DateUtils;
-import com.slibra.common.utils.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
@@ -27,7 +26,6 @@ import java.math.RoundingMode;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.stream.Collectors;
 
 import static com.slibra.common.constant.MyConstants.*;
 import static com.slibra.common.constant.MyConstants.BigDecimal_100;
@@ -974,14 +972,13 @@ public class HandleDataController extends BaseController
         log.info("进入了处理big_table_month历史数据");
         long begin = System.currentTimeMillis();
 
-        List<TXinyiBigTableDay> tXinyiBigTableDayList = tXinyiBigTableDayMapper.selectTXinyiBigTableDayByMonthAvg();
+        List<TXinyiBigTableMonth> tXinyiBigTableDayList = tXinyiBigTableDayMapper.selectTXinyiBigTableDayByMonthAvg();
 
         if ( !CollectionUtils.isEmpty(tXinyiBigTableDayList)  ) {
 
             for (int i = 0; i < tXinyiBigTableDayList.size(); i++) {
-                TXinyiBigTableDay tableDay = tXinyiBigTableDayList.get(i);
+                TXinyiBigTableMonth tableMonth = tXinyiBigTableDayList.get(i);
 
-                TXinyiBigTableMonth tableMonth = new TXinyiBigTableMonth();
 
                 ArrayList<BigDecimal> gyHycRjyAll = new ArrayList<>();
                 ArrayList<BigDecimal> gyHycRjyZdAll = new ArrayList<>();
@@ -1000,53 +997,52 @@ public class HandleDataController extends BaseController
                 ArrayList<BigDecimal> hyQyckxsyAll = new ArrayList<>();
                 ArrayList<BigDecimal> hyHyzlsyAll = new ArrayList<>();
 
-                gyHycRjyAll.add(tableDay.getGyOneHymdDo());
-                gyHycRjyAll.add(tableDay.getGyTwoHymdDo());
-                gyHycRjyZdAll.add(tableDay.getGyOneHyzdDo());
-                gyHycRjyZdAll.add(tableDay.getGyTwoHyzdDo());
-                gyHycWnndAll.add(tableDay.getGyOneMlss());
-                gyHycWnndAll.add(tableDay.getGyTwoMlss());
-
-                rbHycRjyAll.add(tableDay.getRbShcHyOneDo());
-                rbHycRjyAll.add(tableDay.getRbShcHyTwoDo());
-                rbHycWnndAll.add(tableDay.getRbShcHyOneMlss());
-                rbHycWnndAll.add(tableDay.getRbShcHyTwoMlss());
-                rbYycRjyAll.add(tableDay.getRbShcYyOneDo());
-                rbYycRjyAll.add(tableDay.getRbShcYyTwoDo());
-                rbQycRjyAll.add(tableDay.getRbShcQyOneDo());
-                rbQycRjyAll.add(tableDay.getRbShcQyTwoDo());
-                rbWncjbAll.add(tableDay.getRbShcHyOneSv());
-                rbWncjbAll.add(tableDay.getRbShcHyTwoSv());
-                rbWntjzsAll.add(tableDay.getRbShcHyOneSvi());
-                rbWntjzsAll.add(tableDay.getRbShcHyTwoSvi());
-                rbHfxwnndAll.add(tableDay.getRbShcHyOneMlvss());
-                rbHfxwnndAll.add(tableDay.getRbShcHyTwoMlvss());
-
-                hyHycxsyAll.add(tableDay.getHyNo3Hlj1Jqr());
-                hyHycxsyAll.add(tableDay.getHyNo3Hlj2Jqr());
-                hyQyanAll.add(tableDay.getHyNh31Jqr());
-                hyQyanAll.add(tableDay.getHyNh32Jqr());
-                hyQyckxsyAll.add(tableDay.getHyNo3Qyc1Jqr());
-                hyQyckxsyAll.add(tableDay.getHyNo3Qyc2Jqr());
-                hyHyzlsyAll.add(tableDay.getHyTpHl1Jqr());
-                hyHyzlsyAll.add(tableDay.getHyTpHl2Jqr());
-
-                tableDay.setGyHycRjyAll(formatList(gyHycRjyAll));
-                tableDay.setGyHycRjyZdAll(formatList(gyHycRjyZdAll));
-                tableDay.setGyHycWnndAll(formatList(gyHycWnndAll));
-                tableDay.setRbHycRjyAll(formatList(rbHycRjyAll));
-                tableDay.setRbHycWnndAll(formatList(rbHycWnndAll));
-                tableDay.setRbYycRjyAll(formatList(rbYycRjyAll));
-                tableDay.setRbQycRjyAll(formatList(rbQycRjyAll));
-                tableDay.setRbWncjbAll(formatList(rbWncjbAll));
-                tableDay.setRbWntjzsAll(formatList(rbWntjzsAll));
-                tableDay.setRbHfxwnndAll(formatList(rbHfxwnndAll));
-                tableDay.setHyHycxsyAll(formatList(hyHycxsyAll));
-                tableDay.setHyQyanAll(formatList(hyQyanAll));
-                tableDay.setHyQyckxsyAll(formatList(hyQyckxsyAll));
-                tableDay.setHyHyzlsyAll(formatList(hyHyzlsyAll));
-
-                BeanUtils.copyProperties(tableDay, tableMonth);
+                gyHycRjyAll.add(tableMonth.getGyOneHymdDo());
+                gyHycRjyAll.add(tableMonth.getGyTwoHymdDo());
+                gyHycRjyZdAll.add(tableMonth.getGyOneHyzdDo());
+                gyHycRjyZdAll.add(tableMonth.getGyTwoHyzdDo());
+                gyHycWnndAll.add(tableMonth.getGyOneMlss());
+                gyHycWnndAll.add(tableMonth.getGyTwoMlss());
+
+                rbHycRjyAll.add(tableMonth.getRbShcHyOneDo());
+                rbHycRjyAll.add(tableMonth.getRbShcHyTwoDo());
+                rbHycWnndAll.add(tableMonth.getRbShcHyOneMlss());
+                rbHycWnndAll.add(tableMonth.getRbShcHyTwoMlss());
+                rbYycRjyAll.add(tableMonth.getRbShcYyOneDo());
+                rbYycRjyAll.add(tableMonth.getRbShcYyTwoDo());
+                rbQycRjyAll.add(tableMonth.getRbShcQyOneDo());
+                rbQycRjyAll.add(tableMonth.getRbShcQyTwoDo());
+                rbWncjbAll.add(tableMonth.getRbShcHyOneSv());
+                rbWncjbAll.add(tableMonth.getRbShcHyTwoSv());
+                rbWntjzsAll.add(tableMonth.getRbShcHyOneSvi());
+                rbWntjzsAll.add(tableMonth.getRbShcHyTwoSvi());
+                rbHfxwnndAll.add(tableMonth.getRbShcHyOneMlvss());
+                rbHfxwnndAll.add(tableMonth.getRbShcHyTwoMlvss());
+
+                hyHycxsyAll.add(tableMonth.getHyNo3Hlj1Jqr());
+                hyHycxsyAll.add(tableMonth.getHyNo3Hlj2Jqr());
+                hyQyanAll.add(tableMonth.getHyNh31Jqr());
+                hyQyanAll.add(tableMonth.getHyNh32Jqr());
+                hyQyckxsyAll.add(tableMonth.getHyNo3Qyc1Jqr());
+                hyQyckxsyAll.add(tableMonth.getHyNo3Qyc2Jqr());
+                hyHyzlsyAll.add(tableMonth.getHyTpHl1Jqr());
+                hyHyzlsyAll.add(tableMonth.getHyTpHl2Jqr());
+
+                tableMonth.setGyHycRjyAll(formatList(gyHycRjyAll));
+                tableMonth.setGyHycRjyZdAll(formatList(gyHycRjyZdAll));
+                tableMonth.setGyHycWnndAll(formatList(gyHycWnndAll));
+                tableMonth.setRbHycRjyAll(formatList(rbHycRjyAll));
+                tableMonth.setRbHycWnndAll(formatList(rbHycWnndAll));
+                tableMonth.setRbYycRjyAll(formatList(rbYycRjyAll));
+                tableMonth.setRbQycRjyAll(formatList(rbQycRjyAll));
+                tableMonth.setRbWncjbAll(formatList(rbWncjbAll));
+                tableMonth.setRbWntjzsAll(formatList(rbWntjzsAll));
+                tableMonth.setRbHfxwnndAll(formatList(rbHfxwnndAll));
+                tableMonth.setHyHycxsyAll(formatList(hyHycxsyAll));
+                tableMonth.setHyQyanAll(formatList(hyQyanAll));
+                tableMonth.setHyQyckxsyAll(formatList(hyQyckxsyAll));
+                tableMonth.setHyHyzlsyAll(formatList(hyHyzlsyAll));
+
 
                 tXinyiBigTableMonthMapper.insertTXinyiBigTableMonth(tableMonth);
             }
@@ -1063,7 +1059,7 @@ public class HandleDataController extends BaseController
      */
     @GetMapping("/handleBigTableDayHistoryData")
     public String handleBigTableDayHistoryData() {
-        log.info("进入了 处理big_table_hour历史数据");
+        log.info("进入了 处理big_table_day历史数据");
         long begin = System.currentTimeMillis();
 
         List<TXinyiBigTableHour> tXinyiBigTableHours = tXinyiBigTableHourMapper.selectTXinyiBigTableHourByTestDate();
@@ -1075,12 +1071,8 @@ public class HandleDataController extends BaseController
                 TXinyiBigTableHour tXinyiBigTableHour = tXinyiBigTableHours.get(i);
                 String testDate = tXinyiBigTableHour.getTestDate();
 
-                TXinyiBigTableHour tableHour = tXinyiBigTableHourMapper.selectTXinyiBigTableHourAvg(testDate);
-
-                if (!Objects.isNull(tableHour)) {
-                    TXinyiBigTableDay tableDay = new TXinyiBigTableDay();
-
-                    BeanUtils.copyProperties(tableHour, tableDay);
+                TXinyiBigTableDay tableDay = tXinyiBigTableDayMapper.selectTXinyiBigTableHourAvg(testDate);
+                if (!Objects.isNull(tableDay)) {
 
                     ArrayList<BigDecimal> gyHycRjyAll = new ArrayList<>();
                     ArrayList<BigDecimal> gyHycRjyZdAll = new ArrayList<>();
@@ -1099,36 +1091,36 @@ public class HandleDataController extends BaseController
                     ArrayList<BigDecimal> hyQyckxsyAll = new ArrayList<>();
                     ArrayList<BigDecimal> hyHyzlsyAll = new ArrayList<>();
 
-                    gyHycRjyAll.add(tableHour.getGyOneHymdDo());
-                    gyHycRjyAll.add(tableHour.getGyTwoHymdDo());
-                    gyHycRjyZdAll.add(tableHour.getGyOneHyzdDo());
-                    gyHycRjyZdAll.add(tableHour.getGyTwoHyzdDo());
-                    gyHycWnndAll.add(tableHour.getGyOneMlss());
-                    gyHycWnndAll.add(tableHour.getGyTwoMlss());
-
-                    rbHycRjyAll.add(tableHour.getRbShcHyOneDo());
-                    rbHycRjyAll.add(tableHour.getRbShcHyTwoDo());
-                    rbHycWnndAll.add(tableHour.getRbShcHyOneMlss());
-                    rbHycWnndAll.add(tableHour.getRbShcHyTwoMlss());
-                    rbYycRjyAll.add(tableHour.getRbShcYyOneDo());
-                    rbYycRjyAll.add(tableHour.getRbShcYyTwoDo());
-                    rbQycRjyAll.add(tableHour.getRbShcQyOneDo());
-                    rbQycRjyAll.add(tableHour.getRbShcQyTwoDo());
-                    rbWncjbAll.add(tableHour.getRbShcHyOneSv());
-                    rbWncjbAll.add(tableHour.getRbShcHyTwoSv());
-                    rbWntjzsAll.add(tableHour.getRbShcHyOneSvi());
-                    rbWntjzsAll.add(tableHour.getRbShcHyTwoSvi());
-                    rbHfxwnndAll.add(tableHour.getRbShcHyOneMlvss());
-                    rbHfxwnndAll.add(tableHour.getRbShcHyTwoMlvss());
-
-                    hyHycxsyAll.add(tableHour.getHyNo3Hlj1Jqr());
-                    hyHycxsyAll.add(tableHour.getHyNo3Hlj2Jqr());
-                    hyQyanAll.add(tableHour.getHyNh31Jqr());
-                    hyQyanAll.add(tableHour.getHyNh32Jqr());
-                    hyQyckxsyAll.add(tableHour.getHyNo3Qyc1Jqr());
-                    hyQyckxsyAll.add(tableHour.getHyNo3Qyc2Jqr());
-                    hyHyzlsyAll.add(tableHour.getHyTpHl1Jqr());
-                    hyHyzlsyAll.add(tableHour.getHyTpHl2Jqr());
+                    gyHycRjyAll.add(tableDay.getGyOneHymdDo());
+                    gyHycRjyAll.add(tableDay.getGyTwoHymdDo());
+                    gyHycRjyZdAll.add(tableDay.getGyOneHyzdDo());
+                    gyHycRjyZdAll.add(tableDay.getGyTwoHyzdDo());
+                    gyHycWnndAll.add(tableDay.getGyOneMlss());
+                    gyHycWnndAll.add(tableDay.getGyTwoMlss());
+
+                    rbHycRjyAll.add(tableDay.getRbShcHyOneDo());
+                    rbHycRjyAll.add(tableDay.getRbShcHyTwoDo());
+                    rbHycWnndAll.add(tableDay.getRbShcHyOneMlss());
+                    rbHycWnndAll.add(tableDay.getRbShcHyTwoMlss());
+                    rbYycRjyAll.add(tableDay.getRbShcYyOneDo());
+                    rbYycRjyAll.add(tableDay.getRbShcYyTwoDo());
+                    rbQycRjyAll.add(tableDay.getRbShcQyOneDo());
+                    rbQycRjyAll.add(tableDay.getRbShcQyTwoDo());
+                    rbWncjbAll.add(tableDay.getRbShcHyOneSv());
+                    rbWncjbAll.add(tableDay.getRbShcHyTwoSv());
+                    rbWntjzsAll.add(tableDay.getRbShcHyOneSvi());
+                    rbWntjzsAll.add(tableDay.getRbShcHyTwoSvi());
+                    rbHfxwnndAll.add(tableDay.getRbShcHyOneMlvss());
+                    rbHfxwnndAll.add(tableDay.getRbShcHyTwoMlvss());
+
+                    hyHycxsyAll.add(tableDay.getHyNo3Hlj1Jqr());
+                    hyHycxsyAll.add(tableDay.getHyNo3Hlj2Jqr());
+                    hyQyanAll.add(tableDay.getHyNh31Jqr());
+                    hyQyanAll.add(tableDay.getHyNh32Jqr());
+                    hyQyckxsyAll.add(tableDay.getHyNo3Qyc1Jqr());
+                    hyQyckxsyAll.add(tableDay.getHyNo3Qyc2Jqr());
+                    hyHyzlsyAll.add(tableDay.getHyTpHl1Jqr());
+                    hyHyzlsyAll.add(tableDay.getHyTpHl2Jqr());
 
                     tableDay.setGyHycRjyAll(formatList(gyHycRjyAll));
                     tableDay.setGyHycRjyZdAll(formatList(gyHycRjyZdAll));
@@ -1154,7 +1146,7 @@ public class HandleDataController extends BaseController
             if (!CollectionUtils.isEmpty(bigTableDayList)) {
                 SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false);
                 TXinyiBigTableDayMapper sqlSessionMapper =  sqlSession.getMapper(TXinyiBigTableDayMapper.class);
-                bigTableDayList.stream().forEach(item -> sqlSessionMapper.insertTXinyiBigTableDay(item));
+                bigTableDayList.forEach(sqlSessionMapper::insertTXinyiBigTableDay);
                 sqlSession.commit();
                 sqlSession.close();
             }

slibra-system/src/main/java/com/slibra/business/mapper/TXinyiBigTableDayMapper.java

@@ -63,5 +63,7 @@ public interface TXinyiBigTableDayMapper
 
     TXinyiBigTableDay selectAvgByDay(String day);
 
-    List<TXinyiBigTableDay> selectTXinyiBigTableDayByMonthAvg();
+    List<TXinyiBigTableMonth> selectTXinyiBigTableDayByMonthAvg();
+
+    TXinyiBigTableDay selectTXinyiBigTableHourAvg(String testDate);
 }

slibra-system/src/main/java/com/slibra/business/mapper/TXinyiBigTableHourMapper.java

@@ -63,5 +63,4 @@ public interface TXinyiBigTableHourMapper
 
     List<TXinyiBigTableHour> selectTXinyiBigTableHourByTestDate();
 
-    TXinyiBigTableHour selectTXinyiBigTableHourAvg(String testDate);
 }

slibra-system/src/main/resources/mapper/business/TXinyiBigTableDayMapper.xml

@@ -1134,7 +1134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE TEST_DATE = #{day}
     </select>
 
-    <select id="selectTXinyiBigTableDayByMonthAvg" resultType="com.slibra.business.domain.TXinyiBigTableDay">
+    <select id="selectTXinyiBigTableDayByMonthAvg" resultType="com.slibra.business.domain.TXinyiBigTableMonth">
         SELECT
             DATE_FORMAT(STR_TO_DATE(TEST_DATE, '%Y/%m/%d'), '%Y/%m') AS TEST_DATE,
             avg(`GY_JS_COD`) GY_JS_COD,
@@ -1304,4 +1304,171 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             DATE_FORMAT(STR_TO_DATE(TEST_DATE, '%Y/%m/%d'), '%Y/%m');
     </select>
 
+
+    <select id="selectTXinyiBigTableHourAvg" resultMap="TXinyiBigTableDayResult">
+        select
+            avg(`GY_JS_COD`) GY_JS_COD,
+            avg(`GY_JS_PH`) GY_JS_PH,
+            avg(`GY_JS_SS`) GY_JS_SS,
+            avg(`GY_JS_TP`) GY_JS_TP,
+            avg(`GY_JS_TN`) GY_JS_TN,
+            avg(`GY_JS_NH3`) GY_JS_NH3,
+            avg(`GY_JS_SW_PH`) GY_JS_SW_PH,
+            avg(`GY_JS_BFYW`) GY_JS_BFYW,
+            avg(`GY_CS_SLQC`) GY_CS_SLQC,
+            avg(`GY_CS_COD`) GY_CS_COD,
+            avg(`GY_CS_PH`) GY_CS_PH,
+            avg(`GY_CS_SS`) GY_CS_SS,
+            avg(`GY_CS_TN`) GY_CS_TN,
+            avg(`GY_CS_TP`) GY_CS_TP,
+            avg(`GY_CS_NH3`) GY_CS_NH3,
+            avg(`GY_ONE_HYZD_DO`) GY_ONE_HYZD_DO,
+            avg(`GY_ONE_HYMD_DO`) GY_ONE_HYMD_DO,
+            avg(`GY_TWO_HYZD_DO`) GY_TWO_HYZD_DO,
+            avg(`GY_TWO_HYMD_DO`) GY_TWO_HYMD_DO,
+            avg(`GY_ONE_MLSS`) GY_ONE_MLSS,
+            avg(`GY_TWO_MLSS`) GY_TWO_MLSS,
+            avg(`GY_JS_TDS`) GY_JS_TDS,
+            avg(`GY_JS_SLQ`) GY_JS_SLQ,
+            avg(`GY_N_HLB_ONE_GP`) GY_N_HLB_ONE_GP,
+            avg(`GY_N_HLB_TWO_GP`) GY_N_HLB_TWO_GP,
+            avg(`GY_N_HLB_THREE_GP`) GY_N_HLB_THREE_GP,
+            avg(`GY_N_HLB_FOUR_GP` ) GY_N_HLB_FOUR_GP,
+            avg(`GY_NHL_B_FIVE_GP`) GY_NHL_B_FIVE_GP,
+            avg(`GY_N_HLB_SIX_GP`) GY_N_HLB_SIX_GP,
+            avg(`GY_W_HLB_ONE_GP`) GY_W_HLB_ONE_GP,
+            avg(`GY_W_HLB_TWO_GP`) GY_W_HLB_TWO_GP,
+            avg(`GY_W_HLB_THREE_GP`) GY_W_HLB_THREE_GP,
+            avg(`GY_W_HLB_FOUR_GP`) GY_W_HLB_FOUR_GP,
+            avg(`GY_W_HLB_FIVE_GP`) GY_W_HLB_FIVE_GP,
+            avg(`GY_FJ_ONE`) GY_FJ_ONE,
+            avg(`GY_FJ_TWO`) GY_FJ_TWO,
+            avg(`GY_FJ_THREE`) GY_FJ_THREE,
+            avg(`GY_FJ_FOUR`) GY_FJ_FOUR,
+            avg(`GY_FJ_FIVE`) GY_FJ_FIVE,
+            avg(`GY_FJ_SIX`) GY_FJ_SIX,
+            avg(`GY_KQLL_ONE`) GY_KQLL_ONE,
+            avg(`GY_KQLL_TWO`) GY_KQLL_TWO,
+            avg(`GY_KQLL_THREE`) GY_KQLL_THREE,
+            avg(`GY_KQLL_FOUR`) GY_KQLL_FOUR,
+            avg(`GY_KQLL_FIVE`) GY_KQLL_FIVE,
+            avg(`GY_KQLL_SIX`) GY_KQLL_SIX,
+            avg(`GY_SJTYJLY`) GY_SJTYJLY,
+            avg(`GY_CLJYSSLL`) GY_CLJYSSLL,
+            avg(`GY_CL_P04_YCZ`) GY_CL_P04_YCZ,
+            avg(`RB_JS_COD`) RB_JS_COD,
+            avg(`RB_JS_PH`) RB_JS_PH,
+            avg(`RB_JS_BOD5`) RB_JS_BOD5,
+            avg(`RB_JS_SS`) RB_JS_SS,
+            avg(`RB_JS_NH3`) RB_JS_NH3,
+            avg(`RB_JS_TN`) RB_JS_TN,
+            avg(`RB_JS_TP`) RB_JS_TP,
+            avg(`RB_JS_DCGJ`) RB_JS_DCGJ,
+            avg(`RB_CS_COD`) RB_CS_COD,
+            avg(`RB_CS_PH`) RB_CS_PH,
+            avg(`RB_CS_BOD5`) RB_CS_BOD5,
+            avg(`RB_CS_SS`) RB_CS_SS,
+            avg(`RB_CS_NH3`) RB_CS_NH3,
+            avg(`RB_CS_TN`) RB_CS_TN,
+            avg(`RB_CS_TP`) RB_CS_TP,
+            avg(`RB_CS_DCGJ`) RB_CS_DCGJ,
+            avg(`RB_JS_SW`) RB_JS_SW,
+            avg(`RB_CS_SW`) RB_CS_SW,
+            avg(`RB_SHC_ONE_PH`) RB_SHC_ONE_PH,
+            avg(`RB_SHC_TWO_PH`) RB_SHC_TWO_PH,
+            avg(`RB_SHC_HY_ONE_SV`) RB_SHC_HY_ONE_SV,
+            avg(`RB_SHC_HY_TWO_SV`) RB_SHC_HY_TWO_SV,
+            avg(`RB_SHC_HY_ONE_SVI`) RB_SHC_HY_ONE_SVI,
+            avg(`RB_SHC_HY_TWO_SVI`) RB_SHC_HY_TWO_SVI,
+            avg(`RB_SHC_HY_ONE_MLSS`) RB_SHC_HY_ONE_MLSS,
+            avg(`RB_SHC_HY_TWO_MLSS`) RB_SHC_HY_TWO_MLSS,
+            avg(`RB_SHC_HY_ONE_MLVSS`) RB_SHC_HY_ONE_MLVSS,
+            avg(`RB_SHC_HY_TWO_MLVSS`) RB_SHC_HY_TWO_MLVSS,
+            avg(`RB_SHC_YY_ONE_DO`) RB_SHC_YY_ONE_DO,
+            avg(`RB_SHC_YY_TWO_DO`) RB_SHC_YY_TWO_DO,
+            avg(`RB_SHC_QY_ONE_DO`) RB_SHC_QY_ONE_DO,
+            avg(`RB_SHC_QY_TWO_DO`) RB_SHC_QY_TWO_DO,
+            avg(`RB_SHC_HY_ONE_DO`) RB_SHC_HY_ONE_DO,
+            avg(`RB_SHC_HY_TWO_DO`) RB_SHC_HY_TWO_DO,
+            avg(`RB_JSL`) RB_JSL,
+            avg(`RB_CSL`) RB_CSL,
+            avg(`RB_SDCLCXSL`) RB_SDCLCXSL,
+            avg(`RB_QSB`) RB_QSB,
+            avg(`RB_F_M`) RB_F_M,
+            avg(`RB_YY_HRT`) RB_YY_HRT,
+            avg(`RB_HY_HRT`) RB_HY_HRT,
+            avg(`RB_QY_HRT`) RB_QY_HRT,
+            avg(`RB_NHL_R`) RB_NHL_R,
+            avg(`RB_WHL_R`) RB_WHL_R,
+            avg(`RB_SRT`) RB_SRT,
+            avg(`RB_CNL`) RB_CNL,
+            avg(`RB_TYQ_BOD5_TN`) RB_TYQ_BOD5_TN,
+            avg(`RB_TYH_BOD5_TN`) RB_TYH_BOD5_TN,
+            avg(`RB_CHUNILIANG`) RB_CHUNILIANG,
+            avg(`RB_CNHSL`) RB_CNHSL,
+            avg(`RB_GWNL`) RB_GWNL ,
+            avg(`RB_DF`) RB_DF,
+            avg(`RB_XNJF`) RB_XNJF,
+            avg(`RB_CLF`) RB_CLF,
+            avg(`RB_TYF`) RB_TYF,
+            avg(`RB_XDJF`) RB_XDJF,
+            avg(`RB_QTYJF`) RB_QTYJF,
+            avg(`RB_CNF`) RB_CNF,
+            avg(`RB_ZLSF`) RB_ZLSF,
+            avg(`RB_ZJCB`) RB_ZJCB,
+            avg(`RB_DWCB`) RB_DWCB,
+            avg(`HY_COD_YB`) HY_COD_YB,
+            avg(`HY_COD_JQR`) HY_COD_JQR,
+            avg(`HY_COD_YZ`) HY_COD_YZ,
+            avg(`HY_TP_HL1_JQR`) HY_TP_HL1_JQR,
+            avg(`HY_TP_HL2_JQR`) HY_TP_HL2_JQR,
+            avg(`HY_TP_RCC_JQR`) HY_TP_RCC_JQR,
+            avg(`HY_TP_1_YZ`) HY_TP_1_YZ,
+            avg(`HY_TP_2_YZ`) HY_TP_2_YZ,
+            avg(`HY_TP_RCC_YZ`) HY_TP_RCC_YZ,
+            avg(`HY_NH3_1_JQR`) HY_NH3_1_JQR,
+            avg(`HY_NH3_2_JQR`) HY_NH3_2_JQR,
+            avg(`HY_NH3_1_YZ`) HY_NH3_1_YZ,
+            avg(`HY_NO3_HLC1_YZ`) HY_NO3_HLC1_YZ,
+            avg(`HY_NH3_2_YZ`) HY_NH3_2_YZ,
+            avg(`HY_NO3_HLC2_YZ`) HY_NO3_HLC2_YZ,
+            avg(`HY_NO3_HLJ1_JQR`) HY_NO3_HLJ1_JQR,
+            avg(`HY_NO3_HLJ2_JQR`) HY_NO3_HLJ2_JQR,
+            avg(`HY_TYLL`) HY_TYLL,
+            avg(`HY_NO3_QYC_1_JQR`) HY_NO3_QYC_1_JQR,
+            avg(`HY_NO3_QYC_2_JQR`) HY_NO3_QYC_2_JQR,
+            avg(`HY_NO3_QYC_1_YZ`) HY_NO3_QYC_1_YZ,
+            avg(`HY_NO3_QYC_2_YZ`) HY_NO3_QYC_2_YZ,
+            avg(`HY_JSLL`) HY_JSLL,
+            avg(`JS_JS_TDB`) JS_JS_TDB,
+            avg(`JS_JS_TLB`) JS_JS_TLB,
+            avg(`JS_JS_BOD_B_COD`) JS_JS_BOD_B_COD,
+            avg(`JS_YYQ_HRT`) JS_YYQ_HRT,
+            avg(`JS_QYQ_HRT`) JS_QYQ_HRT,
+            avg(`JS_HYQ_HRT`) JS_HYQ_HRT,
+            avg(`JS_HFXWNNDZB`) JS_HFXWNNDZB,
+            avg(`JS_F_M`) JS_F_M,
+            avg(`JS_GSLS`) JS_GSLS,
+            avg(`JS_GSLS_ONE`) JS_GSLS_ONE,
+            avg(`JS_GSLS_TWO`) JS_GSLS_TWO,
+            avg(`JS_XGS_GSLS`) JS_XGS_GSLS,
+            avg(`JS_XLCSC_BMFH`) JS_XLCSC_BMFH,
+            avg(`JS_XLCSC_HRT`) JS_XLCSC_HRT,
+            avg(`JS_CCCDC_BMFH`) JS_CCCDC_BMFH,
+            avg(`JS_CCCDC_HRT`) JS_CCCDC_HRT,
+            avg(`JS_ECC_BMFH`) JS_ECC_BMFH,
+            avg(`JS_ECC_HRT`) JS_ECC_HRT,
+            avg(`JS_ECC_GTFH`) JS_ECC_GTFH,
+            avg(`JS_CLSN_JCSJ`) JS_CLSN_JCSJ,
+            avg(`JS_XGCDC_QSQ_SSLS`) JS_XGCDC_QSQ_SSLS,
+            avg(`JS_WHLB`) JS_WHLB,
+            avg(`JS_WHLB_R_N`) JS_WHLB_R_N,
+            avg(`JS_NHLB`) JS_NHLB,
+            avg(`JS_WDSCNL`) JS_WDSCNL,
+            avg(`JS_QSB`) JS_QSB,
+            avg(`JS_FCXSL`) JS_FCXSL,
+            avg(`JS_FCXSLBL`) JS_FCXSLBL
+        from t_xinyi_big_table_hour where TEST_DATE = #{testDate}
+    </select>
+
 </mapper>

slibra-system/src/main/resources/mapper/business/TXinyiBigTableHourMapper.xml

@@ -969,169 +969,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTXinyiBigTableHourByTestDate" resultMap="TXinyiBigTableHourResult">
         select TEST_DATE from t_xinyi_big_table_hour group by TEST_DATE
     </select>
-    <select id="selectTXinyiBigTableHourAvg" resultMap="TXinyiBigTableHourResult">
-        select
-              avg(`GY_JS_COD`) GY_JS_COD,
-              avg(`GY_JS_PH`) GY_JS_PH,
-              avg(`GY_JS_SS`) GY_JS_SS,
-              avg(`GY_JS_TP`) GY_JS_TP,
-              avg(`GY_JS_TN`) GY_JS_TN,
-              avg(`GY_JS_NH3`) GY_JS_NH3,
-              avg(`GY_JS_SW_PH`) GY_JS_SW_PH,
-              avg(`GY_JS_BFYW`) GY_JS_BFYW,
-              avg(`GY_CS_SLQC`) GY_CS_SLQC,
-              avg(`GY_CS_COD`) GY_CS_COD,
-              avg(`GY_CS_PH`) GY_CS_PH,
-              avg(`GY_CS_SS`) GY_CS_SS,
-              avg(`GY_CS_TN`) GY_CS_TN,
-              avg(`GY_CS_TP`) GY_CS_TP,
-              avg(`GY_CS_NH3`) GY_CS_NH3,
-              avg(`GY_ONE_HYZD_DO`) GY_ONE_HYZD_DO,
-              avg(`GY_ONE_HYMD_DO`) GY_ONE_HYMD_DO,
-              avg(`GY_TWO_HYZD_DO`) GY_TWO_HYZD_DO,
-              avg(`GY_TWO_HYMD_DO`) GY_TWO_HYMD_DO,
-              avg(`GY_ONE_MLSS`) GY_ONE_MLSS,
-              avg(`GY_TWO_MLSS`) GY_TWO_MLSS,
-              avg(`GY_JS_TDS`) GY_JS_TDS,
-              avg(`GY_JS_SLQ`) GY_JS_SLQ,
-              avg(`GY_N_HLB_ONE_GP`) GY_N_HLB_ONE_GP,
-              avg(`GY_N_HLB_TWO_GP`) GY_N_HLB_TWO_GP,
-              avg(`GY_N_HLB_THREE_GP`) GY_N_HLB_THREE_GP,
-              avg(`GY_N_HLB_FOUR_GP` ) GY_N_HLB_FOUR_GP,
-              avg(`GY_NHL_B_FIVE_GP`) GY_NHL_B_FIVE_GP,
-              avg(`GY_N_HLB_SIX_GP`) GY_N_HLB_SIX_GP,
-              avg(`GY_W_HLB_ONE_GP`) GY_W_HLB_ONE_GP,
-              avg(`GY_W_HLB_TWO_GP`) GY_W_HLB_TWO_GP,
-              avg(`GY_W_HLB_THREE_GP`) GY_W_HLB_THREE_GP,
-              avg(`GY_W_HLB_FOUR_GP`) GY_W_HLB_FOUR_GP,
-              avg(`GY_W_HLB_FIVE_GP`) GY_W_HLB_FIVE_GP,
-              avg(`GY_FJ_ONE`) GY_FJ_ONE,
-              avg(`GY_FJ_TWO`) GY_FJ_TWO,
-              avg(`GY_FJ_THREE`) GY_FJ_THREE,
-              avg(`GY_FJ_FOUR`) GY_FJ_FOUR,
-              avg(`GY_FJ_FIVE`) GY_FJ_FIVE,
-              avg(`GY_FJ_SIX`) GY_FJ_SIX,
-              avg(`GY_KQLL_ONE`) GY_KQLL_ONE,
-              avg(`GY_KQLL_TWO`) GY_KQLL_TWO,
-              avg(`GY_KQLL_THREE`) GY_KQLL_THREE,
-              avg(`GY_KQLL_FOUR`) GY_KQLL_FOUR,
-              avg(`GY_KQLL_FIVE`) GY_KQLL_FIVE,
-              avg(`GY_KQLL_SIX`) GY_KQLL_SIX,
-              avg(`GY_SJTYJLY`) GY_SJTYJLY,
-              avg(`GY_CLJYSSLL`) GY_CLJYSSLL,
-              avg(`GY_CL_P04_YCZ`) GY_CL_P04_YCZ,
-              avg(`RB_JS_COD`) RB_JS_COD,
-              avg(`RB_JS_PH`) RB_JS_PH,
-              avg(`RB_JS_BOD5`) RB_JS_BOD5,
-              avg(`RB_JS_SS`) RB_JS_SS,
-              avg(`RB_JS_NH3`) RB_JS_NH3,
-              avg(`RB_JS_TN`) RB_JS_TN,
-              avg(`RB_JS_TP`) RB_JS_TP,
-              avg(`RB_JS_DCGJ`) RB_JS_DCGJ,
-              avg(`RB_CS_COD`) RB_CS_COD,
-              avg(`RB_CS_PH`) RB_CS_PH,
-              avg(`RB_CS_BOD5`) RB_CS_BOD5,
-              avg(`RB_CS_SS`) RB_CS_SS,
-              avg(`RB_CS_NH3`) RB_CS_NH3,
-              avg(`RB_CS_TN`) RB_CS_TN,
-              avg(`RB_CS_TP`) RB_CS_TP,
-              avg(`RB_CS_DCGJ`) RB_CS_DCGJ,
-              avg(`RB_JS_SW`) RB_JS_SW,
-              avg(`RB_CS_SW`) RB_CS_SW,
-              avg(`RB_SHC_ONE_PH`) RB_SHC_ONE_PH,
-              avg(`RB_SHC_TWO_PH`) RB_SHC_TWO_PH,
-              avg(`RB_SHC_HY_ONE_SV`) RB_SHC_HY_ONE_SV,
-              avg(`RB_SHC_HY_TWO_SV`) RB_SHC_HY_TWO_SV,
-              avg(`RB_SHC_HY_ONE_SVI`) RB_SHC_HY_ONE_SVI,
-              avg(`RB_SHC_HY_TWO_SVI`) RB_SHC_HY_TWO_SVI,
-              avg(`RB_SHC_HY_ONE_MLSS`) RB_SHC_HY_ONE_MLSS,
-              avg(`RB_SHC_HY_TWO_MLSS`) RB_SHC_HY_TWO_MLSS,
-              avg(`RB_SHC_HY_ONE_MLVSS`) RB_SHC_HY_ONE_MLVSS,
-              avg(`RB_SHC_HY_TWO_MLVSS`) RB_SHC_HY_TWO_MLVSS,
-              avg(`RB_SHC_YY_ONE_DO`) RB_SHC_YY_ONE_DO,
-              avg(`RB_SHC_YY_TWO_DO`) RB_SHC_YY_TWO_DO,
-              avg(`RB_SHC_QY_ONE_DO`) RB_SHC_QY_ONE_DO,
-              avg(`RB_SHC_QY_TWO_DO`) RB_SHC_QY_TWO_DO,
-              avg(`RB_SHC_HY_ONE_DO`) RB_SHC_HY_ONE_DO,
-              avg(`RB_SHC_HY_TWO_DO`) RB_SHC_HY_TWO_DO,
-              avg(`RB_JSL`) RB_JSL,
-              avg(`RB_CSL`) RB_CSL,
-              avg(`RB_SDCLCXSL`) RB_SDCLCXSL,
-              avg(`RB_QSB`) RB_QSB,
-              avg(`RB_F_M`) RB_F_M,
-              avg(`RB_YY_HRT`) RB_YY_HRT,
-              avg(`RB_HY_HRT`) RB_HY_HRT,
-              avg(`RB_QY_HRT`) RB_QY_HRT,
-              avg(`RB_NHL_R`) RB_NHL_R,
-              avg(`RB_WHL_R`) RB_WHL_R,
-              avg(`RB_SRT`) RB_SRT,
-              avg(`RB_CNL`) RB_CNL,
-              avg(`RB_TYQ_BOD5_TN`) RB_TYQ_BOD5_TN,
-              avg(`RB_TYH_BOD5_TN`) RB_TYH_BOD5_TN,
-              avg(`RB_CHUNILIANG`) RB_CHUNILIANG,
-              avg(`RB_CNHSL`) RB_CNHSL,
-              avg(`RB_GWNL`) RB_GWNL ,
-              avg(`RB_DF`) RB_DF,
-              avg(`RB_XNJF`) RB_XNJF,
-              avg(`RB_CLF`) RB_CLF,
-              avg(`RB_TYF`) RB_TYF,
-              avg(`RB_XDJF`) RB_XDJF,
-              avg(`RB_QTYJF`) RB_QTYJF,
-              avg(`RB_CNF`) RB_CNF,
-              avg(`RB_ZLSF`) RB_ZLSF,
-              avg(`RB_ZJCB`) RB_ZJCB,
-              avg(`RB_DWCB`) RB_DWCB,
-              avg(`HY_COD_YB`) HY_COD_YB,
-              avg(`HY_COD_JQR`) HY_COD_JQR,
-              avg(`HY_COD_YZ`) HY_COD_YZ,
-              avg(`HY_TP_HL1_JQR`) HY_TP_HL1_JQR,
-              avg(`HY_TP_HL2_JQR`) HY_TP_HL2_JQR,
-              avg(`HY_TP_RCC_JQR`) HY_TP_RCC_JQR,
-              avg(`HY_TP_1_YZ`) HY_TP_1_YZ,
-              avg(`HY_TP_2_YZ`) HY_TP_2_YZ,
-              avg(`HY_TP_RCC_YZ`) HY_TP_RCC_YZ,
-              avg(`HY_NH3_1_JQR`) HY_NH3_1_JQR,
-              avg(`HY_NH3_2_JQR`) HY_NH3_2_JQR,
-              avg(`HY_NH3_1_YZ`) HY_NH3_1_YZ,
-              avg(`HY_NO3_HLC1_YZ`) HY_NO3_HLC1_YZ,
-              avg(`HY_NH3_2_YZ`) HY_NH3_2_YZ,
-              avg(`HY_NO3_HLC2_YZ`) HY_NO3_HLC2_YZ,
-              avg(`HY_NO3_HLJ1_JQR`) HY_NO3_HLJ1_JQR,
-              avg(`HY_NO3_HLJ2_JQR`) HY_NO3_HLJ2_JQR,
-              avg(`HY_TYLL`) HY_TYLL,
-              avg(`HY_NO3_QYC_1_JQR`) HY_NO3_QYC_1_JQR,
-              avg(`HY_NO3_QYC_2_JQR`) HY_NO3_QYC_2_JQR,
-              avg(`HY_NO3_QYC_1_YZ`) HY_NO3_QYC_1_YZ,
-              avg(`HY_NO3_QYC_2_YZ`) HY_NO3_QYC_2_YZ,
-              avg(`HY_JSLL`) HY_JSLL,
-              avg(`JS_JS_TDB`) JS_JS_TDB,
-              avg(`JS_JS_TLB`) JS_JS_TLB,
-              avg(`JS_JS_BOD_B_COD`) JS_JS_BOD_B_COD,
-              avg(`JS_YYQ_HRT`) JS_YYQ_HRT,
-              avg(`JS_QYQ_HRT`) JS_QYQ_HRT,
-              avg(`JS_HYQ_HRT`) JS_HYQ_HRT,
-              avg(`JS_HFXWNNDZB`) JS_HFXWNNDZB,
-              avg(`JS_F_M`) JS_F_M,
-              avg(`JS_GSLS`) JS_GSLS,
-              avg(`JS_GSLS_ONE`) JS_GSLS_ONE,
-              avg(`JS_GSLS_TWO`) JS_GSLS_TWO,
-              avg(`JS_XGS_GSLS`) JS_XGS_GSLS,
-              avg(`JS_XLCSC_BMFH`) JS_XLCSC_BMFH,
-              avg(`JS_XLCSC_HRT`) JS_XLCSC_HRT,
-              avg(`JS_CCCDC_BMFH`) JS_CCCDC_BMFH,
-              avg(`JS_CCCDC_HRT`) JS_CCCDC_HRT,
-              avg(`JS_ECC_BMFH`) JS_ECC_BMFH,
-              avg(`JS_ECC_HRT`) JS_ECC_HRT,
-              avg(`JS_ECC_GTFH`) JS_ECC_GTFH,
-              avg(`JS_CLSN_JCSJ`) JS_CLSN_JCSJ,
-              avg(`JS_XGCDC_QSQ_SSLS`) JS_XGCDC_QSQ_SSLS,
-              avg(`JS_WHLB`) JS_WHLB,
-              avg(`JS_WHLB_R_N`) JS_WHLB_R_N,
-              avg(`JS_NHLB`) JS_NHLB,
-              avg(`JS_WDSCNL`) JS_WDSCNL,
-              avg(`JS_QSB`) JS_QSB,
-              avg(`JS_FCXSL`) JS_FCXSL,
-              avg(`JS_FCXSLBL`) JS_FCXSLBL
-        from t_xinyi_big_table_hour where TEST_DATE = #{testDate}
-    </select>
 </mapper>