.gitignore

对比新文件
@@ -0,0 +1,11 @@
/iailab-module-ai/
/*/*/target/
/.idea/
/derby.log
/iailab-plat.iml
/.flattened-pom.xml
/*/.flattened-pom.xml
/*/*/.flattened-pom.xml
/*/replay_pid15548.log
/logs/
/*/*/*.iml

 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/ApiDataController.java

文件名从 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/DataController.java 修改
@@ -40,7 +40,7 @@
@RestController
@RequestMapping("/api/data")
@Tag(name = "数据")
public class DataController {
public class ApiDataController {

    @Resource
    private DaPointService daPointService;

 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/ApiIndItemController.java

文件名从 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/IndItemController.java 修改
@@ -29,7 +29,7 @@
@RestController
@RequestMapping("/api/data/ind-item")
@Tag(name = "指标")
public class IndItemController {
public class ApiIndItemController {

    @Autowired
    private IndItemCollector indItemCollector;

 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/item/controller/admin/IndItemController.java

@@ -97,7 +97,7 @@
        }else if (ItemTypeEnum.DER.getCode().equals(entity.getItemType())){
            IndItemDerVO derItem = indItemDerService.getByItemId(entity.getId());
            respVO.setDerItem(derItem);
            respVO.setAtomItem(indItemAtomService.get(derItem.getAtomItemId()));
            respVO.setAtomItem(indItemAtomService.getByItemId(derItem.getAtomItemId()));
        }else if (ItemTypeEnum.CAL.getCode().equals(entity.getItemType())){
            respVO.setCalItem(indItemCalService.getByItemId(entity.getId()) == null ? new IndItemCalVO() : indItemCalService.getByItemId(entity.getId()));
        }

 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/item/service/impl/IndItemServiceImpl.java

@@ -20,7 +20,6 @@
import com.iailab.module.data.point.service.DaSequenceNumService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.Date;
import java.util.List;
@@ -85,6 +84,16 @@
    public void update(IndItemSaveReqVO updateReqVO) {
        IndItemEntity entity = BeanUtils.toBean(updateReqVO, IndItemEntity.class);
        entity.setUpdateTime(new Date());
        if (ItemTypeEnum.ATOM.getCode().equals(updateReqVO.getItemType())) {
            IndItemAtomEntity atomEntity = BeanUtils.toBean(updateReqVO.getAtomItem(), IndItemAtomEntity.class);
            indItemAtomService.updateById(atomEntity);
        } else if (ItemTypeEnum.DER.getCode().equals(updateReqVO.getItemType())) {
            IndItemDerEntity derEntity = BeanUtils.toBean(updateReqVO.getDerItem(), IndItemDerEntity.class);
            indItemDerServiceImpl.updateById(derEntity);
        } else if (ItemTypeEnum.CAL.getCode().equals(updateReqVO.getItemType())) {
            IndItemCalEntity calEntity = BeanUtils.toBean(updateReqVO.getCalItem(), IndItemCalEntity.class);
            indItemCalServiceImpl.updateById(calEntity);
        }
        baseDao.updateById(entity);
    }


 iailab-module-data/iailab-module-data-biz/src/main/resources/application-dev.yml

@@ -50,10 +50,12 @@
    # password: 123456 # 密码，建议生产环境开启

influx-db:
  org: IAILab
  bucket: whs_data
  token: gxhXM4H1VOBv07kYXKWyPag_zJ8_oChP4ooZ3u-BkSae9LS8R1wWzJYlmUjL3Qe9t1hDU3DtoYD5HTgjWoTGOg==
  url: http://localhost:8086
  org: iailab
  bucket: iailab_data
  token: 2_wr57sVbZQx2QHhN3wWNGOCOtPan_NdCu06NsCGcB8G7rjhjK3yHcLf3uTXE9xkjHHSQwo37E1Mxa0367qXgg==
  url: http://172.16.8.200:8086
  username: root
  password: iailab12345678

iems:
  upload-dir: D:/DLUT/upload/

 iailab-module-data/iailab-module-data-biz/src/main/resources/application-prod.yml

@@ -61,7 +61,7 @@
  token: FLkSbhpYgPrMJBNnOdmxuY3YcG8D_roPtdGPEhwXW9JSxJkEPe1sXUkrYgWcV-nOL9Zjm09RoTfMW44NoRYaXA==
  url: http://192.168.55.180:8086
  username: root
  password: ntt12345678
  password: iailab12345678

iems:
  upload-dir: C:/DLUT/upload/

 iailab-module-data/iailab-module-data-biz/src/main/resources/application-test.yaml

@@ -50,10 +50,12 @@
    password: 123456 # 密码，建议生产环境开启

influx-db:
  org: IAILab
  bucket: whs_data
  token: gxhXM4H1VOBv07kYXKWyPag_zJ8_oChP4ooZ3u-BkSae9LS8R1wWzJYlmUjL3Qe9t1hDU3DtoYD5HTgjWoTGOg==
  url: http://172.16.8.100:8086
  org: iailab
  bucket: buk_shasteel
  token: Q2qsriQG3FEfZ35lik1KSkFToma3bsgfQLwJrNQfSK06MC569sZ9mrQ0vLtsVYn70HMfQcC9gf_yUG16JQtm8w==
  url: http://172.16.8.200:8086
  username: root
  password: iailab12345678

iems:
  upload-dir: D:/DLUT/upload/

 iailab-module-data/iailab-module-data-biz/src/main/resources/mapper/ind/IndItemDao.xml

@@ -6,7 +6,7 @@
    <select id="getItemList" resultType="com.iailab.module.data.ind.item.vo.IndItemRespVO">
        select
        t1.*,
        t2.id as atomItemId
        t2.item_id as atomItemId
        from t_ind_item t1
        left join t_ind_item_atom t2 on t2.item_id = t1.id
        <where>

 iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mdk/dto/MdkScheduleReqDTO.java

@@ -3,6 +3,7 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

import javax.validation.constraints.NotNull;
import java.util.Date;
import java.util.Map;

@@ -15,8 +16,12 @@
@Data
public class MdkScheduleReqDTO {

    @Schema(description = "调度方案编号")
    @NotNull(message="调度方案编号不能为空")
    private String scheduleCode;

    @Schema(description = "调度方案时间")
    @NotNull(message="调度方案时间不能为空")
    private Date scheduleTime;

    private String modelCode;

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/PredictModuleHandler.java

@@ -62,6 +62,8 @@
                Long drtSave = Duration.between(end, endSave).getSeconds();
                log.info(MessageFormat.format("预测项：{0}，保存时间：{1}秒", predictItem.getItemName(),
                        drtSave));

                result.put(predictItem.getItemNo(), predictResult);
            } catch (Exception e) {
                e.printStackTrace();
                log.error(MessageFormat.format("预测项编号：{0}，预测项名称：{1}，预测失败：{2} 预测时刻：{3}",