iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/controller/admin/StSuggestSnapshotConfDetController.java
@@ -2,7 +2,10 @@ 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.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; @@ -33,8 +36,8 @@ @GetMapping("/page") @PreAuthorize("@ss.hasPermission('suggest:snapshot:query')") public CommonResult<PageResult<StSuggestSnapshotConfDetRespVO>> getPage(@Valid StSuggestSnapshotConfDetPageReqVO pageVO) { PageResult<StSuggestSnapshotConfDetRespVO> pageResult = stSuggestSnapshotConfDetService.page(pageVO); return success(pageResult); PageResult<StSuggestSnapshotConfDetEntity> pageResult = stSuggestSnapshotConfDetService.page(pageVO); return success(BeanUtils.toBean(pageResult, StSuggestSnapshotConfDetRespVO.class)); } @PostMapping("/create") iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/controller/admin/StSuggestSnapshotConfMainController.java
@@ -2,7 +2,11 @@ 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.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; @@ -30,8 +34,8 @@ @GetMapping("/page") public CommonResult<PageResult<StSuggestSnapshotConfMainRespVO>> getPage(@Valid StSuggestSnapshotConfMainPageReqVO pageVO) { PageResult<StSuggestSnapshotConfMainRespVO> pageResult = stSuggestSnapshotConfMainService.page(pageVO); return success(pageResult); PageResult<StSuggestSnapshotConfMainEntity> pageResult = stSuggestSnapshotConfMainService.page(pageVO); return success(BeanUtils.toBean(pageResult, StSuggestSnapshotConfMainRespVO.class)); } @PostMapping("/create") iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/controller/admin/StSuggestSnapshotRecordController.java
@@ -19,12 +19,6 @@ @Autowired private StSuggestSnapshotRecordService stSuggestSnapshotRecordService; @GetMapping("/page") public CommonResult<PageResult<StSuggestSnapshotRecordRespVO>> getPage(@Valid StSuggestSnapshotRecordChartReqVO pageVO) { PageResult<StSuggestSnapshotRecordRespVO> pageResult = stSuggestSnapshotRecordService.page(pageVO); return success(pageResult); } @PostMapping("/create") public CommonResult<Boolean> create(@Valid @RequestBody StSuggestSnapshotRecordSaveReqVO createReqVO) { stSuggestSnapshotRecordService.create(createReqVO); iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/StSuggestSnapshotConfDetService.java
@@ -16,7 +16,7 @@ * @author Jay */ public interface StSuggestSnapshotConfDetService extends BaseService<StSuggestSnapshotConfDetEntity> { PageResult<StSuggestSnapshotConfDetRespVO> page(StSuggestSnapshotConfDetPageReqVO reqVO); PageResult<StSuggestSnapshotConfDetEntity> page(StSuggestSnapshotConfDetPageReqVO reqVO); void create(StSuggestSnapshotConfDetSaveReqVO createReqVO);
@@ -11,7 +11,7 @@ * @author Jay */ public interface StSuggestSnapshotConfMainService extends BaseService<StSuggestSnapshotConfMainEntity> { PageResult<StSuggestSnapshotConfMainRespVO> page(StSuggestSnapshotConfMainPageReqVO reqVO); PageResult<StSuggestSnapshotConfMainEntity> page(StSuggestSnapshotConfMainPageReqVO reqVO); void create(StSuggestSnapshotConfMainSaveReqVO createReqVO);
@@ -11,7 +11,6 @@ * @author Jay */ public interface StSuggestSnapshotRecordService extends BaseService<StSuggestSnapshotRecordEntity> { PageResult<StSuggestSnapshotRecordRespVO> page(StSuggestSnapshotRecordChartReqVO reqVO); void create(StSuggestSnapshotRecordSaveReqVO createReqVO);
@@ -8,6 +8,7 @@ import com.iailab.module.model.mcs.sche.dao.StSuggestSnapshotConfDetDao; 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; @@ -16,6 +17,8 @@ import java.util.List; import java.util.UUID; import static com.iailab.framework.common.pojo.CommonResult.success; /** @@ -30,9 +33,8 @@ private StSuggestSnapshotConfDetService stSuggestSnapshotConfDetService; @Override public PageResult<StSuggestSnapshotConfDetRespVO> page(StSuggestSnapshotConfDetPageReqVO reqVO) { IPage<StSuggestSnapshotConfDetRespVO> page = baseDao.selectPage(reqVO); return new PageResult<>(page.getRecords(), page.getTotal()); public PageResult<StSuggestSnapshotConfDetEntity> page(StSuggestSnapshotConfDetPageReqVO reqVO) { return baseDao.selectPage(reqVO); } @Override iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StSuggestSnapshotConfMainServiceImpl.java
@@ -6,11 +6,9 @@ import com.iailab.framework.common.service.impl.BaseServiceImpl; import com.iailab.framework.common.util.object.BeanUtils; import com.iailab.module.model.mcs.sche.dao.StSuggestSnapshotConfMainDao; import com.iailab.module.model.mcs.sche.entity.StSuggestSnapshotConfMainDetEntity; 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.service.StSuggestSnapshotConfMainDetService; 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; @@ -19,6 +17,8 @@ import java.util.List; import java.util.UUID; import static com.iailab.framework.common.pojo.CommonResult.success; /** @@ -29,9 +29,8 @@ implements StSuggestSnapshotConfMainService { @Override public PageResult<StSuggestSnapshotConfMainRespVO> page(StSuggestSnapshotConfMainPageReqVO reqVO) { IPage<StSuggestSnapshotConfMainRespVO> page = baseDao.selectPage(reqVO); return new PageResult<>(page.getRecords(), page.getTotal()); public PageResult<StSuggestSnapshotConfMainEntity> page(StSuggestSnapshotConfMainPageReqVO reqVO) { return baseDao.selectPage(reqVO); } @Override iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StSuggestSnapshotRecordServiceImpl.java
@@ -6,8 +6,10 @@ import com.iailab.framework.common.service.impl.BaseServiceImpl; import com.iailab.framework.common.util.object.BeanUtils; import com.iailab.module.model.mcs.sche.dao.StSuggestSnapshotRecordDao; import com.iailab.module.model.mcs.sche.entity.StScheduleModelEntity; import com.iailab.module.model.mcs.sche.entity.StSuggestSnapshotRecordEntity; import com.iailab.module.model.mcs.sche.service.StSuggestSnapshotRecordService; import com.iailab.module.model.mcs.sche.vo.StScheduleModelRespVO; import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotRecordChartReqVO; import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotRecordRespVO; import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotRecordSaveReqVO; @@ -15,6 +17,8 @@ import org.springframework.stereotype.Service; import java.util.UUID; import static com.iailab.framework.common.pojo.CommonResult.success; /** @@ -27,12 +31,6 @@ @Autowired private StSuggestSnapshotRecordService StSuggestSnapshotRecordService; @Override public PageResult<StSuggestSnapshotRecordRespVO> page(StSuggestSnapshotRecordChartReqVO reqVO) { IPage<StSuggestSnapshotRecordRespVO> page = baseDao.selectPage(reqVO); return new PageResult<>(page.getRecords(), page.getTotal()); } @Override @DSTransactional(rollbackFor = Exception.class)
