修改：1.分析结果列表增加批次删除筛选

     2.注释测试代码
     3.批次列表风场名称列

energy-manage-service/src/main/java/com/energy/manage/service/service/analysis/impl/AnalysisServiceImpl.java

@@ -930,9 +930,9 @@ public class AnalysisServiceImpl implements AnalysisService {
 //        list.add("123.html");
 //        list = list.stream().filter(item -> !item.endsWith(".png")).collect(Collectors.toList());
 //        System.out.println(list);
-        Matcher matcher =  Pattern.compile(ENGINE_CODE_PATTEN).matcher("1231231231/12312/WEM00001");
-        String result = matcher.find() ? matcher.group() : "";
-        System.out.println(result);
+//        Matcher matcher =  Pattern.compile(ENGINE_CODE_PATTEN).matcher("1231231231/12312/WEM00001");
+//        String result = matcher.find() ? matcher.group() : "";
+//        System.out.println(result);
     }
 
 }

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

@@ -36,6 +36,7 @@
         left join sys_organization_auth auth
         on batch.field_code = auth.code_number
         where auth.role_id = #{roleId,jdbcType=INTEGER}
+        and batch.is_delete = 0
         <if test="fieldName != null and fieldName != ''">
             and batch.field_name like concat('%', #{fieldName,jdbcType=VARCHAR}, '%')
         </if>

energy-manage-service/src/main/resources/mybatis/windenginebatch/WindFieldBatchMapper.xml

@@ -85,12 +85,14 @@
     <select id="selectWindFieldBatch" parameterType="com.energy.manage.service.domain.dto.windfieldbatch.WindFileBatchPageDto" resultType="com.energy.manage.service.domain.vo.windfieldbatch.WindFieldBatchVo">
         select batch.batch_code,
                batch.batch_name,
-               batch.field_name,
+               field.field_name,
                batch.field_code,
                batch.batch_state,
                batch.is_delete,
                batch.create_time
         from wind_field_batch batch
+        left join wind_field field
+        on batch.field_code = field.field_code
         left join sys_organization_auth auth
         on batch.field_code = auth.code_number
         where batch.is_delete = 0