feat: 修改聚合sql

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

@@ -943,6 +943,7 @@ public class HandleDataController extends BaseController
 
         int num = ( count / size ) + 1;
 
+        int index = 0;
         for (int i = 0; i < num; i++) {
             List<TXinyiIndustry> tXinyiIndustries = xinyiIndustryMapper.selectTXinyiIndustryListByPage(i * size, size);
             if ( !CollectionUtils.isEmpty(tXinyiIndustries) ) {
@@ -983,6 +984,8 @@ public class HandleDataController extends BaseController
                 }
 
                 if (!CollectionUtils.isEmpty(tXinyiBigTableHourList)) {
+                    index += tXinyiBigTableHourList.size();
+
                     SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH,false);
                     TXinyiBigTableHourMapper sqlSessionMapper = sqlSession.getMapper(TXinyiBigTableHourMapper.class);
                     tXinyiBigTableHourList.stream().forEach(item -> sqlSessionMapper.insertTXinyiBigTableHour(item));
@@ -992,6 +995,8 @@ public class HandleDataController extends BaseController
             }
         }
 
+        System.out.println( "index :::" + index );
+
         long end = System.currentTimeMillis();
         return "ok;耗时：" + (end - begin) /1000 + "秒。";
     }

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

@@ -262,11 +262,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTXinyiRobotByAvg" parameterType="TXinyiRobot" resultType="com.slibra.business.domain.TXinyiRobot">
         SELECT
-            <choose>
-                <when test="testDate != null">TEST_DATE,</when>
-                <when test="testHour != null">TEST_HOUR,</when>
-                <when test="testTime != null">TEST_TIME,</when>
-            </choose>
             AVG(COD_YB) codYb,
             AVG(COD_JQR) codJqr,
             AVG(COD_YZ) codYz,
@@ -296,17 +291,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AVG(HYZLSY_ALL) hyzlsyAll
         FROM
         t_xinyi_robot
-        <where>
-            <if test="testDate != null">TEST_DATE = #{testDate}</if>
-            <if test="testHour != null">TEST_HOUR = #{testHour}</if>
-            <if test="testTime != null">TEST_TIME = #{testTime}</if>
-        </where>
-        GROUP BY
-        <choose>
-            <when test="testDate != null">TEST_DATE</when>
-            <when test="testHour != null">TEST_HOUR</when>
-            <when test="testTime != null">TEST_TIME</when>
-        </choose>
+        where TEST_HOUR = #{testHour}
     </select>
 
 </mapper>