修改：wind_field_batch表弃用，牵涉的接口修改

energy-manage-service/src/main/resources/mybatis/analysis/AnalysisResultMapper.xml

@@ -84,21 +84,14 @@
     </select>
 
     <select id="selectLastBatchResultByFieldCode" parameterType="java.lang.String" resultType="com.energy.manage.service.domain.vo.analysis.AnalysisResultVo">
-        select result.*
-        from analysis_result result
-        where batch_code in (
-            select batch_code
-            from  wind_field_batch
-            where id in (
-                select max( id )
-                from wind_field_batch
-                group by field_code
-                having field_code in
-                <foreach collection="fieldCodes" item="item" separator="," open="(" close=")">
-                    #{item,jdbcType=VARCHAR}
-                </foreach>
-            )
-        )
+        select *
+        from analysis_result
+        where batch_code in
+            <foreach collection="fieldCodes" item="item" separator="," open="(" close=")">
+                #{item,jdbcType=VARCHAR}
+            </foreach>
+        order by id desc
+        limit 1
     </select>
 
     <update id="updateOnOffCall">

energy-manage-service/src/main/resources/mybatis/system/OrganizationAuthMapper.xml

@@ -56,17 +56,15 @@
         wind_field wf on soa.code_number = wf.field_code
         left join
         (select
-         wfb.id,
-         wfb.batch_code,
-         wfb.field_code,
-         wfb.create_time,
-         ar.analysis_state
+             id,
+             batch_code,
+             field_code,
+             create_time,
+             analysis_state
          from
-         wind_field_batch wfb
-         left join
-         analysis_result ar on wfb.batch_code = ar.batch_code
-         where wfb.create_time in
-         (select max(create_time) from wind_field_batch group by field_code)) wfbr on wf.field_code = wfbr.field_code
+             analysis_result
+         where create_time in
+         (select max(create_time) from analysis_result group by field_code)) wfbr on wf.field_code = wfbr.field_code
         where 1=1
         </select>
 
@@ -114,17 +112,15 @@
         wind_field wf on soa.code_number = wf.field_code
         left join
         (select
-         wfb.id,
-         wfb.batch_code,
-         wfb.field_code,
-         wfb.create_time,
-         ar.analysis_state
+            id,
+            batch_code,
+            field_code,
+            create_time,
+            analysis_state
          from
-         wind_field_batch wfb
-         left join
-         analysis_result ar on wfb.batch_code = ar.batch_code
-         where wfb.create_time in
-         (select max(create_time) from wind_field_batch group by field_code)) wfbr on wf.field_code = wfbr.field_code
+            analysis_result
+         where create_time in
+         (select max(create_time) from analysis_result group by field_code)) wfbr on wf.field_code = wfbr.field_code
         where 1=1
         </select>
 
@@ -143,19 +139,17 @@
             wind_engine_group where del_state = 0 group by field_code) weg on soa.code_number = weg.field_code
             left join
             (select
-            wfb.id,
-            wfb.batch_code,
-            wfb.field_code,
-            wfb.create_time,
-            ar.analysis_state
+                id,
+                batch_code,
+                field_code,
+                create_time,
+                analysis_state
             from
-            wind_field_batch wfb
-            left join
-            analysis_result ar on wfb.batch_code = ar.batch_code
-            where wfb.create_time in
+                analysis_result
+            where create_time in
             (select
             max(create_time)
-            from wind_field_batch
+            from analysis_result
             group by field_code)) wfba on soa.code_number = wfba.field_code
             where 1=1
             and soa.code_type = 'field'

energy-manage-service/src/main/resources/mybatis/windenginegroup/WindEngineGroupMapper.xml

@@ -129,9 +129,9 @@
             engine.engine_code as engineCode,
             engine.engine_name as engineName
         from wind_engine_group engine
-        left join wind_field_batch batch
-        on engine.field_code = batch.field_code
-        where batch.batch_code = #{batchCode}
+        left join analysis_result result
+        on engine.field_code = result.field_code
+        where result.batch_code = #{batchCode}
     </select>
 
     <select id="selectMaxRatedCapacity" parameterType="java.lang.String" resultType="java.math.BigDecimal">

energy-manage-service/src/main/resources/mybatis/windexceptioncount/WindExceptionCountMapper.xml

@@ -53,20 +53,20 @@
         select
             count.*,
             engine.engine_name,
-            batch.field_code,
-            batch.field_name
+            result.field_code,
+            result.field_name
         from
             wind_exception_count count
-        left join wind_field_batch batch
-        on batch.batch_code = count.batch_code
+        left join analysis_result result
+        on result.batch_code = count.batch_code
         left join wind_engine_group engine
         on engine.engine_code = count.engine_code
         where count.is_delete = 0
-        and batch.batch_code in (
+        and result.batch_code in (
                 select distinct
                     batch_code
                 from
-                    wind_field_batch
+                    analysis_result
                 where
                     field_code in
                     <foreach collection="fieldCodes" open="(" separator="," close=")" item="fieldCode">