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; @@ -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; @@ -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/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); } }