Merge remote-tracking branch 'origin/master'

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/controller/admin/StSuggestSnapshotConfDetController.java

@@ -5,10 +5,7 @@
import com.iailab.framework.common.util.object.BeanUtils;
import com.iailab.module.model.mcs.sche.entity.StSuggestSnapshotConfDetEntity;
import com.iailab.module.model.mcs.sche.service.StSuggestSnapshotConfDetService;
import com.iailab.module.model.mcs.sche.vo.StScheduleModelRespVO;
import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfDetPageReqVO;
import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfDetRespVO;
import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfDetSaveReqVO;
import com.iailab.module.model.mcs.sche.vo.*;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,7 +22,7 @@
 * @Description
 * @createTime 2025年05月23日
 */
@Tag(name = "调度建议快照详情")
@Tag(name = "调度建议快照配置详情")
@RestController
@RequestMapping("/model/suggest/snapshot/conf-det")
public class StSuggestSnapshotConfDetController {
@@ -61,4 +58,11 @@
        stSuggestSnapshotConfDetService.delete(id);
        return success(true);
    }

    @GetMapping("/get")
    @PreAuthorize("@ss.hasPermission('suggest:snapshot:info')")
    public CommonResult<StSuggestSnapshotConfDetRespVO> get(@RequestParam("id") String id) {
        StSuggestSnapshotConfDetRespVO result = stSuggestSnapshotConfDetService.get(id);
        return success(result);
    }
}

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/controller/admin/StSuggestSnapshotConfMainController.java

@@ -3,19 +3,20 @@
import com.iailab.framework.common.pojo.CommonResult;
import com.iailab.framework.common.pojo.PageResult;
import com.iailab.framework.common.util.object.BeanUtils;
import com.iailab.module.model.mcs.sche.entity.StSuggestSnapshotConfDetEntity;
import com.iailab.module.model.mcs.sche.entity.StSuggestSnapshotConfMainEntity;
import com.iailab.module.model.api.mcs.dto.StScheduleModelOutDTO;
import com.iailab.module.model.mcs.sche.entity.*;
import com.iailab.module.model.mcs.sche.service.StSuggestSnapshotConfMainService;
import com.iailab.module.model.mcs.sche.vo.StScheduleModelRespVO;
import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfMainPageReqVO;
import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfMainRespVO;
import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfMainSaveReqVO;
import com.iailab.module.model.mcs.sche.vo.*;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;

import java.util.List;

import static com.iailab.framework.common.pojo.CommonResult.success;

@@ -24,7 +25,7 @@
 * @Description
 * @createTime 2025年05月23日
 */
@Tag(name = "调度建议快照")
@Tag(name = "调度建议快照配置主表")
@RestController
@RequestMapping("/model/suggest/snapshot/conf-main")
public class StSuggestSnapshotConfMainController {
@@ -33,24 +34,35 @@
    private StSuggestSnapshotConfMainService stSuggestSnapshotConfMainService;
    
    @GetMapping("/page")
    @PreAuthorize("@ss.hasPermission('suggest:snapshot:query')")
    public CommonResult<PageResult<StSuggestSnapshotConfMainRespVO>> getPage(@Valid StSuggestSnapshotConfMainPageReqVO pageVO) {
        PageResult<StSuggestSnapshotConfMainEntity> pageResult = stSuggestSnapshotConfMainService.page(pageVO);
        return success(BeanUtils.toBean(pageResult, StSuggestSnapshotConfMainRespVO.class));
    }

    @GetMapping("/get")
    @PreAuthorize("@ss.hasPermission('suggest:snapshot:info')")
    public CommonResult<StSuggestSnapshotConfMainRespVO> get(@RequestParam("id") String id) {
        StSuggestSnapshotConfMainRespVO result = stSuggestSnapshotConfMainService.get(id);
        return success(result);
    }

    @PostMapping("/create")
    @PreAuthorize("@ss.hasPermission('suggest:snapshot:create')")
    public CommonResult<Boolean> create(@Valid @RequestBody StSuggestSnapshotConfMainSaveReqVO createReqVO) {
        stSuggestSnapshotConfMainService.create(createReqVO);
        return success(true);
    }

    @PutMapping("/update")
    @PreAuthorize("@ss.hasPermission('suggest:snapshot:update')")
    public CommonResult<Boolean> update(@Valid @RequestBody StSuggestSnapshotConfMainSaveReqVO updateReqVO) {
        stSuggestSnapshotConfMainService.update(updateReqVO);
        return success(true);
    }

    @DeleteMapping("/delete")
    @PreAuthorize("@ss.hasPermission('suggest:snapshot:delete')")
    @Parameter(name = "id", description = "编号", required = true, example = "1024")
    public CommonResult<Boolean> deleteTenant(@RequestParam("id") String id) {
        stSuggestSnapshotConfMainService.delete(id);

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/dao/StSuggestSnapshotConfDetDao.java

@@ -4,11 +4,9 @@
import com.iailab.framework.mybatis.core.mapper.BaseMapperX;
import com.iailab.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.iailab.framework.tenant.core.db.dynamic.TenantDS;
import com.iailab.module.model.mcs.sche.entity.StScheduleModelEntity;
import com.iailab.module.model.mcs.sche.entity.StSuggestSnapshotConfDetEntity;
import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfDetPageReqVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * @author Jay
@@ -17,6 +15,7 @@
@Mapper
public interface StSuggestSnapshotConfDetDao extends BaseMapperX<StSuggestSnapshotConfDetEntity> {
    default PageResult<StSuggestSnapshotConfDetEntity> selectPage(StSuggestSnapshotConfDetPageReqVO reqVO) {
        return selectPage(reqVO);
        return selectPage(reqVO,new LambdaQueryWrapperX<StSuggestSnapshotConfDetEntity>()
                .likeIfPresent(StSuggestSnapshotConfDetEntity::getConfId,reqVO.getConfId()));
    }
}

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/dao/StSuggestSnapshotConfMainDao.java

@@ -6,13 +6,8 @@
import com.iailab.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.iailab.framework.tenant.core.db.dynamic.TenantDS;
import com.iailab.module.model.mcs.sche.entity.StSuggestSnapshotConfMainEntity;
import com.iailab.module.model.mcs.sche.entity.StSuggestSnapshotConfMainEntity;
import com.iailab.module.model.mcs.sche.entity.StSuggestSnapshotConfMainEntity;
import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfMainPageReqVO;
import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfMainPageReqVO;
import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfMainRespVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * @author Jay
@@ -21,6 +16,7 @@
@Mapper
public interface StSuggestSnapshotConfMainDao extends BaseMapperX<StSuggestSnapshotConfMainEntity> {
    default PageResult<StSuggestSnapshotConfMainEntity> selectPage(StSuggestSnapshotConfMainPageReqVO reqVO) {
        return selectPage(reqVO);
        return selectPage(reqVO,new LambdaQueryWrapperX<StSuggestSnapshotConfMainEntity>()
                .likeIfPresent(StSuggestSnapshotConfMainEntity::getModelId,reqVO.getModelId()));
    }
}

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/entity/StSuggestSnapshotConfDetEntity.java

@@ -14,7 +14,7 @@
 */
@Data
@TableName("t_st_suggest_snapshot_conf_det")
public class StSuggestSnapshotConfDetEntity extends BaseDO {
public class StSuggestSnapshotConfDetEntity implements Serializable {
    private static final long serialVersionUID = 1L;

    /**
@@ -44,7 +44,7 @@
    private Integer leftLength;

    /**
     * 右侧侧长度(min)
     * 右侧长度(min)
     */
    private Integer rightLength;


 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/StSuggestSnapshotConfDetService.java

@@ -23,4 +23,6 @@
    void delete(String id);

    List<StSuggestSnapshotConfDetRespVO> getByConfId(String confId);

    StSuggestSnapshotConfDetRespVO get(String id);
}

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/StSuggestSnapshotConfMainService.java

@@ -2,6 +2,7 @@

import com.iailab.framework.common.pojo.PageResult;
import com.iailab.framework.common.service.BaseService;
import com.iailab.module.model.mcs.sche.entity.StScheduleModelEntity;
import com.iailab.module.model.mcs.sche.entity.StSuggestSnapshotConfMainEntity;
import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfMainPageReqVO;
import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfMainRespVO;
@@ -20,4 +21,6 @@
    void delete(String id);

    StSuggestSnapshotConfMainRespVO getByModelIdAndScheduleObj(String modelId,  String scheduleObj);

    StSuggestSnapshotConfMainRespVO get(String id);
}

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StSuggestSnapshotConfDetServiceImpl.java

@@ -11,6 +11,7 @@
import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfDetPageReqVO;
import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfDetRespVO;
import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfDetSaveReqVO;
import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfMainRespVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -59,4 +60,9 @@
    public List<StSuggestSnapshotConfDetRespVO> getByConfId(String confId) {
        return ConvertUtils.sourceToTarget(baseDao.selectList("conf_id", confId), StSuggestSnapshotConfDetRespVO.class);
    }

    @Override
    public StSuggestSnapshotConfDetRespVO get(String id) {
        return ConvertUtils.sourceToTarget( baseDao.selectById(id), StSuggestSnapshotConfDetRespVO.class);
    }
}

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StSuggestSnapshotConfMainServiceImpl.java

@@ -6,6 +6,7 @@
import com.iailab.framework.common.util.object.BeanUtils;
import com.iailab.framework.common.util.object.ConvertUtils;
import com.iailab.module.model.mcs.sche.dao.StSuggestSnapshotConfMainDao;
import com.iailab.module.model.mcs.sche.entity.StScheduleModelEntity;
import com.iailab.module.model.mcs.sche.entity.StSuggestSnapshotConfMainEntity;
import com.iailab.module.model.mcs.sche.service.StSuggestSnapshotConfMainService;
import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfMainPageReqVO;
@@ -53,4 +54,9 @@
    public StSuggestSnapshotConfMainRespVO getByModelIdAndScheduleObj(String modelId,  String scheduleObj) {
        return ConvertUtils.sourceToTarget( baseDao.selectOne("model_id", modelId,  "schedule_obj", scheduleObj), StSuggestSnapshotConfMainRespVO.class);
    }

    @Override
    public StSuggestSnapshotConfMainRespVO get(String id) {
        return ConvertUtils.sourceToTarget( baseDao.selectById(id), StSuggestSnapshotConfMainRespVO.class);
    }
}

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/vo/StSuggestSnapshotConfDetPageReqVO.java

@@ -1,7 +1,10 @@
package com.iailab.module.model.mcs.sche.vo;

import com.iailab.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;


/**
@@ -9,7 +12,9 @@
 */
@Schema(description = "模型服务 - 调度建议快照配置分页 Request VO")
@Data
public class StSuggestSnapshotConfDetPageReqVO {
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class StSuggestSnapshotConfDetPageReqVO extends PageParam {

    @Schema(description = "模型ID")
    private String confId;

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/vo/StSuggestSnapshotConfMainPageReqVO.java

@@ -1,8 +1,11 @@
package com.iailab.module.model.mcs.sche.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.iailab.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;

import java.util.Date;

@@ -12,7 +15,9 @@
 */
@Schema(description = "模型服务 - 调度建议快照配置详情分页 Request VO")
@Data
public class StSuggestSnapshotConfMainPageReqVO {
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class StSuggestSnapshotConfMainPageReqVO extends PageParam {

    @Schema(description = "标题")
    private String title;

 iailab-module-model/iailab-module-model-biz/src/main/resources/application.yml

@@ -232,6 +232,9 @@
      - t_mm_predict_influence_factor
      - t_mm_predict_influence_factor_result
      - t_st_suggest_operation_record
      - t_st_suggest_snapshot_conf_det
      - t_st_suggest_snapshot_conf_main
      - t_st_suggest_snapshot_record
  app:
    app-key: model
    app-secret: 85b0df7edc3df3611913df34ed695011

 iailab-plat-sdk/src/main/java/com/iailab/sdk/util/http/IailabHttpUtils.java

@@ -90,7 +90,7 @@
            httpPost.addHeader("Content-Type", "application/json;charset=UTF-8");
            httpPost.addHeader("Authorization", "Bearer " + IailabClient.accessToken);
            httpPost.addHeader("Tenant-Id", SdkAutoConfiguration.TENANT_ID.toString());
            StringEntity stringEntity = new StringEntity(json);
            StringEntity stringEntity = new StringEntity(json,"UTF-8");
            stringEntity.setContentEncoding("UTF-8");
            stringEntity.setContentType("application/json");
            httpPost.setEntity(stringEntity);