Merge branch 'energy-manage-chy'

energy-manage-service/src/main/java/com/energy/manage/service/constant/analysis/AnalysisConstants.java

@@ -72,7 +72,7 @@ public interface AnalysisConstants {
     String IMAGE_SUFFIX = ".png";
 
     /**
-     * 已执行状态
+     * 已执行状态/或开启状态
      */
     Integer ON_CALL = 1;
 

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/analysis/AutoAnalysisConfigDetailDto.java

@@ -41,7 +41,7 @@ public class AutoAnalysisConfigDetailDto extends BaseDto {
     /**
      * 是否开启 0：关闭 1：开启
      */
-    private Integer startupState = 1;
+    private Integer startupState;
 
     /**
      * 配置唯一标识

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

@@ -64,7 +64,7 @@ public class AutoAnalysisServiceImpl implements AutoAnalysisService {
     public void autoAnalysis() {
         log.info("触发自动分析定时任务开始。");
         //查询所有风场启动中的自动分析配置
-        List<AutoAnalysisConfigDetailVo> detailVos = autoAnalysisConfigDetailMapper.selectByCondition(new AutoAnalysisConfigDetailDto());
+        List<AutoAnalysisConfigDetailVo> detailVos = autoAnalysisConfigDetailMapper.selectByCondition(new AutoAnalysisConfigDetailDto().setStartupState(AnalysisConstants.ON_CALL));
         if(CollectionUtils.isEmpty(detailVos)){
             log.info("当前无自动分析配置，不执行自动分析。");
             return;

energy-manage-service/src/main/resources/mybatis/autoanalysisconfigdetail/AutoAnalysisConfigDetailMapper.xml

@@ -22,7 +22,7 @@
     from auto_analysis_config_detail detail
     left join wind_field field
     on detail.field_code = field.field_code
-    <where>
+    where 1=1
       <if test="fieldCode != null and fieldCode != ''">
         and detail.field_code = #{fieldCode}
       </if>
@@ -33,8 +33,6 @@
         and detail.startup_state = #{startupState}
       </if>
       order by detail.update_time desc
-    </where>
-
   </select>
 
   <select id="selectByUniqueId" parameterType="java.lang.String" resultMap="BaseResultMap">