Browse Source

新增自动分析配置

chenhongyan1989 4 tháng trước cách đây
mục cha
commit
12b04516df
17 tập tin đã thay đổi với 640 bổ sung6 xóa
  1. 34 0
      energy-manage-common/src/main/java/com/energy/manage/common/enums/OptionEnums.java
  2. 6 1
      energy-manage-common/src/main/java/com/energy/manage/common/po/analysis/AnalysisResultPo.java
  3. 59 0
      energy-manage-common/src/main/java/com/energy/manage/common/po/autoanalysisconfigdetail/AutoAnalysisConfigDetailPo.java
  4. 57 0
      energy-manage-common/src/main/java/com/energy/manage/common/po/autoanalysisconfigdetailoptionrecords/AutoAnalysisConfigDetailOptionRecordsPo.java
  5. 3 0
      energy-manage-common/src/main/java/com/energy/manage/common/reponse/ConstVar.java
  6. 5 5
      energy-manage-service/generator/generatorConfig.xml
  7. 57 0
      energy-manage-service/src/main/java/com/energy/manage/service/controller/analysis/AutoAnalysisConfigController.java
  8. 49 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/analysis/AutoAnalysisConfigDetailDto.java
  9. 5 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/analysis/AnalysisResultVo.java
  10. 60 0
      energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/analysis/AutoAnalysisConfigDetailVo.java
  11. 23 0
      energy-manage-service/src/main/java/com/energy/manage/service/mappers/autoanalysisconfigdetail/AutoAnalysisConfigDetailMapper.java
  12. 11 0
      energy-manage-service/src/main/java/com/energy/manage/service/mappers/autoanalysisconfigdetailoptionrecords/AutoAnalysisConfigDetailOptionRecordsMapper.java
  13. 48 0
      energy-manage-service/src/main/java/com/energy/manage/service/service/autoanalysisconfig/AutoAnalysisConfigService.java
  14. 117 0
      energy-manage-service/src/main/java/com/energy/manage/service/service/autoanalysisconfig/impl/AutoAnalysisConfigServiceImpl.java
  15. 1 0
      energy-manage-service/src/main/resources/mybatis/analysis/AnalysisResultMapper.xml
  16. 87 0
      energy-manage-service/src/main/resources/mybatis/autoanalysisconfigdetail/AutoAnalysisConfigDetailMapper.xml
  17. 18 0
      energy-manage-service/src/main/resources/mybatis/autoanalysisconfigdetailoptionrecords/AutoAnalysisConfigDetailOptionRecordsMapper.xml

+ 34 - 0
energy-manage-common/src/main/java/com/energy/manage/common/enums/OptionEnums.java

@@ -0,0 +1,34 @@
+package com.energy.manage.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+/**
+ * @author chy
+ * @date 2025/3/27 14:51
+ * @desc
+ */
+@NoArgsConstructor
+@AllArgsConstructor
+public enum OptionEnums {
+
+    /**
+     * 1:增加 2:修改
+     */
+    ADD(1,"增加"),
+    EDIT(2,"修改"),
+    OFF(2,"关停"),
+    ON(3,"启动");
+
+
+    @Getter
+    @Setter
+    private Integer code;
+
+    @Getter
+    @Setter
+    private String msg;
+
+}

+ 6 - 1
energy-manage-common/src/main/java/com/energy/manage/common/po/analysis/AnalysisResultPo.java

@@ -129,5 +129,10 @@ public class AnalysisResultPo {
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date analysisFinishTime;
-    
+
+    /**
+     * 是否手动分析 0:否 1:是
+     */
+    private Integer analysisFlag;
+
 }

+ 59 - 0
energy-manage-common/src/main/java/com/energy/manage/common/po/autoanalysisconfigdetail/AutoAnalysisConfigDetailPo.java

@@ -0,0 +1,59 @@
+package com.energy.manage.common.po.autoanalysisconfigdetail;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author: chy
+ * @Date: 2025/3/27 09:38
+ * @Description:自动分析配置
+ */
+
+@Data
+@Accessors(chain = true)
+@Table(name = "auto_analysis_config_detail")
+public class AutoAnalysisConfigDetailPo {
+
+    /**
+     * 主键
+     */
+    @Id
+    private Long id;
+
+    /**
+     * 风场编码
+     */
+    private String fieldCode;
+
+    /**
+     * 间隔天数
+     */
+    private Integer intervalDays;
+
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+
+    /**
+     * 是否开启 0:关闭 1:开启
+     */
+    private Integer startupState;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+
+}

+ 57 - 0
energy-manage-common/src/main/java/com/energy/manage/common/po/autoanalysisconfigdetailoptionrecords/AutoAnalysisConfigDetailOptionRecordsPo.java

@@ -0,0 +1,57 @@
+package com.energy.manage.common.po.autoanalysisconfigdetailoptionrecords;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.persistence.Table;
+import java.util.Date;
+
+/**
+ * @Author: chy
+ * @Date: 2025/3/27 09:34
+ * @Description: 自动分析操作记录表
+ *
+ */
+
+@Data
+@Accessors(chain = true)
+@Table(name = "auto_analysis_config_detail_option_records")
+public class AutoAnalysisConfigDetailOptionRecordsPo {
+
+    /**
+     * 唯一标识
+     */
+    private Integer id;
+
+    /**
+     * 风场编号
+     */
+    private String fieldCode;
+
+    /**
+     * 原始间隔天数
+     */
+    private Integer sourceIntevalDays;
+
+    /**
+     * 原始开始时间
+     */
+    private Date sourceStartTime;
+
+    /**
+     * 原始启动状态 0:关闭 1:开启
+     */
+    private Integer sourceStartupState;
+
+    /**
+     * 操作标识 0:新增 1:编辑 2:关停 3:启动
+     */
+    private Integer optionFlag;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+
+}

+ 3 - 0
energy-manage-common/src/main/java/com/energy/manage/common/reponse/ConstVar.java

@@ -90,6 +90,9 @@ public enum ConstVar {
 
   EXSIT_BATCH_NAME(1010001, "当前批次名称已存在,请重新编辑"),
 
+
+  EXSIT_ON_CONFIG(1020001, "当前风场已存在启动中的自动分析配置"),
+
   //测评小程序
   PAPER_USER_UNBELONG_TO(3000,"哎呀,该测评已经被其他用户绑定过了,您无法进行查看~"),
   PAPER_ANSWER_SIZE_ERROR(3001,"试题未答完,请检查试题");

+ 5 - 5
energy-manage-service/generator/generatorConfig.xml

@@ -50,7 +50,7 @@
 
         <!--数据库连接信息:驱动类、链接地址、用户名、密码 -->
         <jdbcConnection driverClass="com.mysql.jdbc.Driver"
-                        connectionURL="jdbc:mysql://192.168.50.233:3306/energy?useUnicode=true"
+                        connectionURL="jdbc:mysql://192.168.50.233:3306/energy_show?useUnicode=true"
                         userId="admin"
                         password="admin123456">
             <!--高版本的 mysql-connector-java 需要设置 nullCatalogMeansCurrent=true-->
@@ -76,7 +76,7 @@
         </javaTypeResolver>
 
         <!-- java实体类路径 -->
-        <javaModelGenerator targetPackage="analysisdatarelationrecords" targetProject="src/main/java">
+        <javaModelGenerator targetPackage="com.energy.manage.common.po.autoanalysisconfigdetail" targetProject="src/main/java">
             <!--  for MyBatis3/MyBatis3Simple
                 自动为每一个生成的类创建一个构造方法,构造方法包含了所有的field;而不是使用setter;
               -->
@@ -90,7 +90,7 @@
         </javaModelGenerator>
 
         <!-- 生成映射文件xml的包名和位置-->
-        <sqlMapGenerator targetPackage="mybatis.analysisdatarelationrecords" targetProject="src/main/resources">
+        <sqlMapGenerator targetPackage="mybatis.autoanalysisconfigdetail" targetProject="src/main/resources">
             <!-- 是否让schema作为包后缀-->
             <property name="enableSubPackages" value="false"/>
         </sqlMapGenerator>
@@ -99,7 +99,7 @@
             type="XMLMAPPER" 会将接口的实现放在 mapper.xml中,也推荐这样配置。
             type="ANNOTATEDMAPPER",接口的实现通过注解写在接口上面
          -->
-        <javaClientGenerator type="XMLMAPPER" targetPackage="com.energy.manage.service.mappers.analysisdatarelationrecords"
+        <javaClientGenerator type="XMLMAPPER" targetPackage="com.energy.manage.service.mappers.autoanalysisconfigdetail"
                              targetProject="src/main/java">
             <!-- 是否让schema作为包后缀-->
             <property name="enableSubPackages" value="false"/>
@@ -113,7 +113,7 @@
             生成全部表tableName设为 %
         -->
 
-        <table tableName="analysis_data_relation_records" domainObjectName="analysisDataRelationRecordsPo"
+        <table tableName="auto_analysis_config_detail" domainObjectName="AutoAnalysisConfigDetail"
                enableDeleteByExample="false"
                enableCountByExample="false"
                enableSelectByExample="false"

+ 57 - 0
energy-manage-service/src/main/java/com/energy/manage/service/controller/analysis/AutoAnalysisConfigController.java

@@ -0,0 +1,57 @@
+package com.energy.manage.service.controller.analysis;
+
+import com.energy.manage.common.base.Page;
+import com.energy.manage.common.reponse.ResultResp;
+import com.energy.manage.service.config.annotations.UserLoginToken;
+import com.energy.manage.service.controller.base.BaseServiceController;
+import com.energy.manage.service.domain.dto.analysis.AutoAnalysisConfigDetailDto;
+import com.energy.manage.service.domain.vo.analysis.AutoAnalysisConfigDetailVo;
+import com.energy.manage.service.service.autoanalysisconfig.AutoAnalysisConfigService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author chy
+ * @date 2025/3/27 09:05
+ * @desc 自动分析配置
+ */
+@Api(value = "AutoAnalysisConfigController",tags = "自动分析配置")
+@RestController
+@RequestMapping("/autoAnalysis")
+public class AutoAnalysisConfigController extends BaseServiceController {
+
+    @Autowired
+    private AutoAnalysisConfigService autoAnalysisConfigService;
+
+
+    @ApiOperation(value = "自动分析配置列表")
+    @UserLoginToken
+    @GetMapping("/configList")
+    public ResultResp<Page<AutoAnalysisConfigDetailVo>> configList(AutoAnalysisConfigDetailDto autoAnalysisConfigDetailDto) {
+        return pageResult(autoAnalysisConfigService.configList(autoAnalysisConfigDetailDto),autoAnalysisConfigDetailDto);
+    }
+
+    @ApiOperation(value = "增加配置")
+    @UserLoginToken
+    @PostMapping("/configSave")
+    public ResultResp configSave(@RequestBody AutoAnalysisConfigDetailDto autoAnalysisConfigDetailDto) {
+        return success(autoAnalysisConfigService.configSave(autoAnalysisConfigDetailDto));
+    }
+
+
+    @ApiOperation(value = "编辑配置")
+    @UserLoginToken
+    @PostMapping("/configEdit")
+    public ResultResp configEdit(@RequestBody AutoAnalysisConfigDetailDto autoAnalysisConfigDetailDto) {
+        return success(autoAnalysisConfigService.configEdit(autoAnalysisConfigDetailDto));
+    }
+
+    @ApiOperation(value = "编辑配置")
+    @UserLoginToken
+    @PostMapping("/onOff")
+    public ResultResp onOff(@RequestBody AutoAnalysisConfigDetailDto autoAnalysisConfigDetailDto) {
+        return autoAnalysisConfigService.onOff(autoAnalysisConfigDetailDto);
+    }
+}

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

@@ -0,0 +1,49 @@
+package com.energy.manage.service.domain.dto.analysis;
+
+import com.energy.manage.service.domain.dto.BaseDto;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * @author chy
+ * @date 2025/3/27 09:54
+ * @desc
+ */
+@Data
+@Accessors(chain = true)
+public class AutoAnalysisConfigDetailDto extends BaseDto {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 风场名称
+     */
+    private String fieldName;
+
+    /**
+     * 风场编码
+     */
+    private String fieldCode;
+
+    /**
+     * 间隔天数
+     */
+    private Integer intervalDays;
+
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date startTime;
+
+    /**
+     * 是否开启 0:关闭 1:开启
+     */
+    private Integer startupState = 1;
+}

+ 5 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/analysis/AnalysisResultVo.java

@@ -136,4 +136,9 @@ public class AnalysisResultVo {
      */
     private String orderNum;
 
+    /**
+     * 是否手动分析 0:否 1:是
+     */
+    private Integer analysisFlag;
+
 }

+ 60 - 0
energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/analysis/AutoAnalysisConfigDetailVo.java

@@ -0,0 +1,60 @@
+package com.energy.manage.service.domain.vo.analysis;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * @author chy
+ * @date 2025/3/27 09:52
+ * @desc
+ */
+@Data
+@Accessors(chain = true)
+public class AutoAnalysisConfigDetailVo {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 风场名称
+     */
+    private String fieldName;
+
+    /**
+     * 风场编码
+     */
+    private String fieldCode;
+
+    /**
+     * 间隔天数
+     */
+    private Integer intervalDays;
+
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date startTime;
+
+    /**
+     * 是否开启 0:关闭 1:开启
+     */
+    private Boolean startupState;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
+}

+ 23 - 0
energy-manage-service/src/main/java/com/energy/manage/service/mappers/autoanalysisconfigdetail/AutoAnalysisConfigDetailMapper.java

@@ -0,0 +1,23 @@
+package com.energy.manage.service.mappers.autoanalysisconfigdetail;
+
+import com.energy.manage.common.mapper.MyMapper;
+import com.energy.manage.common.po.autoanalysisconfigdetail.AutoAnalysisConfigDetailPo;
+import com.energy.manage.service.domain.dto.analysis.AutoAnalysisConfigDetailDto;
+import com.energy.manage.service.domain.vo.analysis.AutoAnalysisConfigDetailVo;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface AutoAnalysisConfigDetailMapper extends MyMapper<AutoAnalysisConfigDetailPo> {
+
+
+    List<AutoAnalysisConfigDetailVo> selectByCondition(AutoAnalysisConfigDetailDto detail);
+
+
+    int insertConfig(AutoAnalysisConfigDetailDto detailDto);
+
+
+    int updateConfigByCondition(AutoAnalysisConfigDetailDto detailDto);
+}

+ 11 - 0
energy-manage-service/src/main/java/com/energy/manage/service/mappers/autoanalysisconfigdetailoptionrecords/AutoAnalysisConfigDetailOptionRecordsMapper.java

@@ -0,0 +1,11 @@
+package com.energy.manage.service.mappers.autoanalysisconfigdetailoptionrecords;
+
+import com.energy.manage.common.mapper.MyMapper;
+import com.energy.manage.common.po.autoanalysisconfigdetailoptionrecords.AutoAnalysisConfigDetailOptionRecordsPo;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface AutoAnalysisConfigDetailOptionRecordsMapper extends MyMapper<AutoAnalysisConfigDetailOptionRecordsPo> {
+
+
+}

+ 48 - 0
energy-manage-service/src/main/java/com/energy/manage/service/service/autoanalysisconfig/AutoAnalysisConfigService.java

@@ -0,0 +1,48 @@
+package com.energy.manage.service.service.autoanalysisconfig;
+
+import com.energy.manage.common.reponse.ResultResp;
+import com.energy.manage.service.domain.dto.analysis.AutoAnalysisConfigDetailDto;
+import com.energy.manage.service.domain.vo.analysis.AutoAnalysisConfigDetailVo;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * @author chy
+ * @date 2025/3/27 09:49
+ * @desc
+ */
+
+public interface AutoAnalysisConfigService {
+
+
+    /**
+     *  查询列表
+     * @param autoAnalysisConfigDetailDto
+     * @return
+     */
+    List<AutoAnalysisConfigDetailVo> configList(AutoAnalysisConfigDetailDto autoAnalysisConfigDetailDto);
+
+
+    /**
+     * 保存配置
+     * @param autoAnalysisConfigDetailDto
+     * @return
+     */
+    int configSave(AutoAnalysisConfigDetailDto autoAnalysisConfigDetailDto);
+
+    /**
+     * 配置编辑
+     * @param autoAnalysisConfigDetailDto
+     * @return
+     */
+    int configEdit(AutoAnalysisConfigDetailDto autoAnalysisConfigDetailDto);
+
+    /**
+     * 启动/关闭
+     * @param autoAnalysisConfigDetailDto
+     * @return
+     */
+    ResultResp onOff(AutoAnalysisConfigDetailDto autoAnalysisConfigDetailDto);
+
+}

+ 117 - 0
energy-manage-service/src/main/java/com/energy/manage/service/service/autoanalysisconfig/impl/AutoAnalysisConfigServiceImpl.java

@@ -0,0 +1,117 @@
+package com.energy.manage.service.service.autoanalysisconfig.impl;
+
+import com.energy.manage.common.enums.OptionEnums;
+import com.energy.manage.common.po.autoanalysisconfigdetail.AutoAnalysisConfigDetailPo;
+import com.energy.manage.common.po.autoanalysisconfigdetailoptionrecords.AutoAnalysisConfigDetailOptionRecordsPo;
+import com.energy.manage.common.reponse.ResultResp;
+import com.energy.manage.service.domain.dto.analysis.AutoAnalysisConfigDetailDto;
+import com.energy.manage.service.domain.vo.analysis.AutoAnalysisConfigDetailVo;
+import com.energy.manage.service.mappers.autoanalysisconfigdetail.AutoAnalysisConfigDetailMapper;
+import com.energy.manage.service.mappers.autoanalysisconfigdetailoptionrecords.AutoAnalysisConfigDetailOptionRecordsMapper;
+import com.energy.manage.service.service.autoanalysisconfig.AutoAnalysisConfigService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+import static com.energy.manage.common.reponse.ConstVar.EXSIT_ON_CONFIG;
+
+/**
+ * @author chy
+ * @date 2025/3/27 09:50
+ * @desc
+ */
+@Service
+public class AutoAnalysisConfigServiceImpl implements AutoAnalysisConfigService {
+
+    @Autowired
+    private AutoAnalysisConfigDetailMapper autoAnalysisConfigDetailMapper;
+
+    @Autowired
+    private AutoAnalysisConfigDetailOptionRecordsMapper optionRecordsMapper;
+
+    /**
+     * @param autoAnalysisConfigDetailDto
+     * @return
+     */
+    @Override
+    public List<AutoAnalysisConfigDetailVo> configList(AutoAnalysisConfigDetailDto autoAnalysisConfigDetailDto) {
+        return autoAnalysisConfigDetailMapper.selectByCondition(autoAnalysisConfigDetailDto);
+    }
+
+    @Override
+    public int configSave(AutoAnalysisConfigDetailDto autoAnalysisConfigDetailDto) {
+        List<AutoAnalysisConfigDetailVo> vos = autoAnalysisConfigDetailMapper.selectByCondition(autoAnalysisConfigDetailDto);
+        if(CollectionUtils.isNotEmpty(vos)){
+            return 0;
+        }
+        //保存配置
+        int saveCount = autoAnalysisConfigDetailMapper.insertConfig(autoAnalysisConfigDetailDto);
+        //保存操作记录
+        optionRecordsMapper.insertSelective(new AutoAnalysisConfigDetailOptionRecordsPo().setFieldCode(autoAnalysisConfigDetailDto.getFieldCode()));
+        return saveCount;
+    }
+
+    @Override
+    public int configEdit(AutoAnalysisConfigDetailDto detailDto) {
+        //保存操作记录(先保存原始值)
+        saveOptionRecords(detailDto.getId(), OptionEnums.EDIT.getCode());
+        //更新配置
+        return autoAnalysisConfigDetailMapper.updateConfigByCondition(detailDto);
+    }
+
+    /**
+     * 启动/关闭
+     * @param detailDto
+     * @return
+     */
+    @Override
+    public ResultResp onOff(AutoAnalysisConfigDetailDto detailDto) {
+        int startupState = detailDto.getStartupState();
+        //判断当前风场有无启动中的配置
+        if(hasStartupConfig(detailDto)){
+            return ResultResp.FAIL(EXSIT_ON_CONFIG);
+        }
+        //保存操作记录
+        int optionFlag = startupState == 1 ? OptionEnums.ON.getCode() : OptionEnums.OFF.getCode();
+        //保存操作记录(先保存操作记录,后更新)
+        saveOptionRecords(detailDto.getId(), optionFlag);
+        //更新配置
+        autoAnalysisConfigDetailMapper.updateConfigByCondition(detailDto);
+        return ResultResp.SUCCESS();
+    }
+
+    /**
+     * 是否存在启动中的配置
+     * @param detailDto
+     * @return
+     */
+    private Boolean hasStartupConfig(AutoAnalysisConfigDetailDto detailDto){
+        if(detailDto.getStartupState() == 0){
+            return false;
+        }
+        //获取当前风场启动中的配置列表
+        List<AutoAnalysisConfigDetailVo> vos = autoAnalysisConfigDetailMapper.selectByCondition(new AutoAnalysisConfigDetailDto()
+                                                                                                        .setFieldCode(detailDto.getFieldCode()));
+        return CollectionUtils.isNotEmpty(vos);
+    }
+
+    /**
+     * 保存操作记录
+     * @param id
+     * @param optionFlag
+     */
+    private void saveOptionRecords(Long id, Integer optionFlag){
+        //查询更新前的配置,为后续保存操作记录做准备
+        AutoAnalysisConfigDetailPo exist = autoAnalysisConfigDetailMapper.selectByPrimaryKey(id);
+        //保存操作记录
+        AutoAnalysisConfigDetailOptionRecordsPo recordsPo = new AutoAnalysisConfigDetailOptionRecordsPo()
+                                                                    .setFieldCode(exist.getFieldCode())
+                                                                    .setOptionFlag(optionFlag)
+                                                                    .setSourceStartupState(exist.getStartupState())
+                                                                    .setSourceIntevalDays(exist.getIntervalDays())
+                                                                    .setSourceStartTime(exist.getStartTime());
+        optionRecordsMapper.insertSelective(recordsPo);
+    }
+}

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

@@ -25,6 +25,7 @@
         <result column="data_type_code" property="dataTypeCode" jdbcType="VARCHAR"/>
         <result column="analysis_start_time" property="analysisStartTime" jdbcType="DATE"/>
         <result column="analysis_finish_time" property="analysisFinishTime" jdbcType="DATE"/>
+        <result column="analysis_flag" property="analysisFlag" jdbcType="INTEGER"/>
 
     </resultMap>
 

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

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.energy.manage.service.mappers.autoanalysisconfigdetail.AutoAnalysisConfigDetailMapper">
+  <resultMap id="BaseResultMap" type="com.energy.manage.common.po.autoanalysisconfigdetail.AutoAnalysisConfigDetailPo">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="field_code" jdbcType="VARCHAR" property="fieldCode" />
+    <result column="interval_days" jdbcType="INTEGER" property="intervalDays" />
+    <result column="start_time" jdbcType="TIMESTAMP" property="startTime" />
+    <result column="startup_state" jdbcType="INTEGER" property="startupState" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+     field_code, interval_days, start_time, startup_state, create_time, update_time
+  </sql>
+
+  <select id="selectByCondition" parameterType="com.energy.manage.service.domain.dto.analysis.AutoAnalysisConfigDetailDto"  resultType="com.energy.manage.service.domain.vo.analysis.AutoAnalysisConfigDetailVo">
+    select
+    detail.*,
+    field.field_name
+    from auto_analysis_config_detail detail
+    left join wind_field field
+    on detail.field_code = field.field_code
+    <where>
+      <if test="fieldCode != null and fieldCode != ''">
+        and detail.field_code = #{fieldCode}
+      </if>
+      <if test="fieldName != null and fieldName != ''">
+        and field.field_name like concat ('%', #{fieldName}, '%')
+      </if>
+      <if test="startupState != null">
+        and detail.startup_state = #{startupState}
+      </if>
+      order by detail.update_time desc
+    </where>
+
+
+  </select>
+
+  <insert id="insertConfig" parameterType="com.energy.manage.service.domain.dto.analysis.AutoAnalysisConfigDetailDto">
+    insert into auto_analysis_config_detail
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="fieldCode != null and fieldCode != ''">
+        field_code,
+      </if>
+      <if test="intervalDays != null">
+        interval_days,
+      </if>
+      <if test="startTime != null">
+        start_time,
+      </if>
+      <if test="startupState != null">
+        startup_state,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="fieldCode != null and fieldCode != ''">
+        #{fieldCode,jdbcType=VARCHAR},
+      </if>
+      <if test="intervalDays != null">
+        #{intervalDays,jdbcType=INTEGER},
+      </if>
+      <if test="startTime != null">
+        #{startTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="startupState != null">
+        #{startupState,jdbcType=BIT},
+      </if>
+    </trim>
+  </insert>
+
+  <update id="updateConfigByCondition" parameterType="com.energy.manage.service.domain.dto.analysis.AutoAnalysisConfigDetailDto">
+    update auto_analysis_config_detail
+    <set>
+      <if test="intervalDays != null">
+        interval_days = #{intervalDays,jdbcType=INTEGER},
+      </if>
+      <if test="startTime != null">
+        start_time = #{startTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="startupState != null">
+        startup_state = #{startupState,jdbcType=BIT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

+ 18 - 0
energy-manage-service/src/main/resources/mybatis/autoanalysisconfigdetailoptionrecords/AutoAnalysisConfigDetailOptionRecordsMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.energy.manage.service.mappers.autoanalysisconfigdetailoptionrecords.AutoAnalysisConfigDetailOptionRecordsMapper">
+  <resultMap id="BaseResultMap" type="com.energy.manage.common.po.autoanalysisconfigdetailoptionrecords.AutoAnalysisConfigDetailOptionRecordsPo">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="field_code" jdbcType="VARCHAR" property="fieldCode" />
+    <result column="source_inteval_days" jdbcType="INTEGER" property="sourceIntevalDays" />
+    <result column="source_start_time" jdbcType="TIMESTAMP" property="sourceStartTime" />
+    <result column="source_startup_state" jdbcType="INTEGER" property="sourceStartupState" />
+    <result column="option_flag" jdbcType="INTEGER" property="optionFlag" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, field_code, source_inteval_days, source_start_time, source_startup_state, option_flag,
+    create_time
+  </sql>
+
+</mapper>