diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/messagecenter/MessageCenterController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/messagecenter/MessageCenterController.java index bcc6463c..48d49727 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/messagecenter/MessageCenterController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/messagecenter/MessageCenterController.java @@ -44,14 +44,12 @@ public class MessageCenterController { @PostMapping("/create") @Operation(summary = "创建消息中心") - public CommonResult createMessageCenter(@Valid @RequestBody MessageCenterSaveReqVO createReqVO) { return success(messageCenterService.createMessageCenter(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新消息中心") - public CommonResult updateMessageCenter(@Valid @RequestBody MessageCenterSaveReqVO updateReqVO) { messageCenterService.updateMessageCenter(updateReqVO); return success(true); @@ -60,7 +58,6 @@ public class MessageCenterController { @DeleteMapping("/delete") @Operation(summary = "删除消息中心") @Parameter(name = "id", description = "编号", required = true) - public CommonResult deleteMessageCenter(@RequestParam("id") String id) { messageCenterService.deleteMessageCenter(id); return success(true); @@ -69,7 +66,6 @@ public class MessageCenterController { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除消息中心") - public CommonResult deleteMessageCenterList(@RequestParam("ids") List ids) { messageCenterService.deleteMessageCenterListByIds(ids); return success(true); @@ -78,7 +74,6 @@ public class MessageCenterController { @GetMapping("/get") @Operation(summary = "获得消息中心") @Parameter(name = "id", description = "编号", required = true, example = "1024") - public CommonResult getMessageCenter(@RequestParam("id") String id) { MessageCenterDO messageCenter = messageCenterService.getMessageCenter(id); return success(BeanUtils.toBean(messageCenter, MessageCenterRespVO.class)); @@ -86,7 +81,6 @@ public class MessageCenterController { @GetMapping("/page") @Operation(summary = "获得消息中心分页") - public CommonResult> getMessageCenterPage(@Valid MessageCenterPageReqVO pageReqVO) { PageResult pageResult = messageCenterService.getMessageCenterPage(pageReqVO); return success(BeanUtils.toBean(pageResult, MessageCenterRespVO.class)); @@ -94,7 +88,6 @@ public class MessageCenterController { @GetMapping("/export-excel") @Operation(summary = "导出消息中心 Excel") - @ApiAccessLog(operateType = EXPORT) public void exportMessageCenterExcel(@Valid MessageCenterPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/ModelManagementController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/ModelManagementController.java index 08f45f24..aeb6d6d4 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/ModelManagementController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/ModelManagementController.java @@ -99,6 +99,13 @@ public class ModelManagementController { return success(convertPageResult(pageResult)); } + @GetMapping("/getList") + @Operation(summary = "获得模型管理分页") + public CommonResult> getList(@Valid ModelManagementPageReqVO pageReqVO) { + List pageResult = modelManagementService.getList(pageReqVO); + return success(pageResult); + } + @GetMapping("/export-excel") @Operation(summary = "导出模型管理 Excel") @ApiAccessLog(operateType = EXPORT) @@ -120,7 +127,7 @@ public class ModelManagementController { List respVOList = pageResult.getList().stream() .map(this::convertToRespVO) .collect(java.util.stream.Collectors.toList()); - + return new PageResult<>(respVOList, pageResult.getTotal()); } @@ -129,13 +136,13 @@ public class ModelManagementController { */ private ModelManagementRespVO convertToRespVO(ModelManagementDO modelManagementDO) { ModelManagementRespVO respVO = BeanUtils.toBean(modelManagementDO, ModelManagementRespVO.class); - + // 设置suitablePlantingAreas字段,触发自动转换 respVO.setSuitablePlantingAreas(modelManagementDO.getSuitablePlantingAreasList()); - + // 设置speciesImageList字段,触发自动转换 respVO.setSpeciesImageList(modelManagementDO.getSpeciesImageList()); - + return respVO; } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelmanagement/ModelManagementService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelmanagement/ModelManagementService.java index a12c8194..c323707d 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelmanagement/ModelManagementService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelmanagement/ModelManagementService.java @@ -67,4 +67,6 @@ public interface ModelManagementService { void isRelease(@Valid ModelManagementSaveReqVO updateReqVO); PageResult getModelManagementPageRelease(@Valid ModelManagementPageReqVO pageReqVO); + + List getList(@Valid ModelManagementPageReqVO pageReqVO); } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelmanagement/ModelManagementServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelmanagement/ModelManagementServiceImpl.java index 06922feb..a8eb97be 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelmanagement/ModelManagementServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelmanagement/ModelManagementServiceImpl.java @@ -25,6 +25,7 @@ import cn.iocoder.yudao.module.farm.dal.mysql.modelpestdiseaseweed.ModelPestDise import cn.iocoder.yudao.module.farm.dal.mysql.modelweatherdisaster.ModelWeatherDisasterMapper; import cn.iocoder.yudao.module.farm.enums.CommonConstants; import cn.iocoder.yudao.module.farm.service.sysDict.SysDictService; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -60,8 +61,9 @@ public class ModelManagementServiceImpl implements ModelManagementService { private ModelFarmingOperationMapper modelFarmingOperationMapper; @Resource private ModelFarmingOperationInputMapper modelFarmingOperationInputMapper; -@Resource -private SysDictService dictService; + @Resource + private SysDictService dictService; + @Override public String createModelManagement(ModelManagementSaveReqVO createReqVO) { LoginUser user = getLoginUser(); @@ -346,4 +348,12 @@ private SysDictService dictService; return modelManagementMapper.selectPageRelease(pageReqVO); } + @Override + public List getList(ModelManagementPageReqVO pageReqVO) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(ModelManagementDO::getTenantId, getLoginUser().getTenantId()); + lambdaQueryWrapper.eq(ModelManagementDO::getType, CommonConstants.MODEL_TYPE_1); + return modelManagementMapper.selectList(lambdaQueryWrapper); + } + } \ No newline at end of file