From 029966bb11ddfe919713eff4c719caa61fd37666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=BE=E5=AF=8C=E6=96=8C?= Date: Mon, 13 Oct 2025 19:29:54 +0800 Subject: [PATCH] =?UTF-8?q?fix=20(farm):=20=E5=BE=AE=E4=BF=A1=E7=AB=AF?= =?UTF-8?q?=E8=B5=84=E8=AE=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 资讯分页 --- .../farmnews/vo/FarmInformationPageReqVO.java | 1 + .../farm/controller/admin/wx/WxController.java | 1 - .../farminformation/FarmInformationMapper.java | 11 +++++++++++ .../yudao/module/farm/enums/CommonConstants.java | 14 ++++++++++++++ .../FarmInformationServiceImpl.java | 12 ++++++++++-- 5 files changed, 36 insertions(+), 3 deletions(-) diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/farmnews/vo/FarmInformationPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/farmnews/vo/FarmInformationPageReqVO.java index 83c43840..ba57fb81 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/farmnews/vo/FarmInformationPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/farmnews/vo/FarmInformationPageReqVO.java @@ -12,5 +12,6 @@ import lombok.Data; public class FarmInformationPageReqVO extends PageParam { private String id; + private String infoTitle; } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/wx/WxController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/wx/WxController.java index ec9ed19f..9ceaf227 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/wx/WxController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/wx/WxController.java @@ -195,7 +195,6 @@ public class WxController { @Operation(summary = "农业资讯") @GetMapping("/farm-information/page") public CommonResult> getFarmInformation(@Valid FarmInformationPageReqVO req) { - // TODO: 2025/10/13 待实现 PageResult result = farmInformationService.getFarmInformationPage(req); return CommonResult.success(result); } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farminformation/FarmInformationMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farminformation/FarmInformationMapper.java index 27cf3ed2..4772ec10 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farminformation/FarmInformationMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farminformation/FarmInformationMapper.java @@ -1,6 +1,12 @@ package cn.iocoder.yudao.module.farm.dal.mysql.farminformation; +import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.companyinfo.vo.CompanyInfoPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.farmnews.vo.FarmInformationPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.farmnews.vo.FarmInformationPageRespVO; +import cn.iocoder.yudao.module.farm.dal.dataobject.companyinfo.CompanyInfoDO; import cn.iocoder.yudao.module.farm.dal.dataobject.farminformation.FarmInformationDO; import org.apache.ibatis.annotations.Mapper; @@ -12,4 +18,9 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface FarmInformationMapper extends BaseMapperX { + default PageResult selectPage(FarmInformationPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .likeIfPresent(FarmInformationDO::getInfoTitle, reqVO.getInfoTitle()) + .orderByDesc(FarmInformationDO::getCreateTime)); + } } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/enums/CommonConstants.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/enums/CommonConstants.java index 98eaab31..64498af9 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/enums/CommonConstants.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/enums/CommonConstants.java @@ -33,12 +33,20 @@ public class CommonConstants { public final static Integer DEVICE_STATE_3 = 3; // 维护中 public final static Integer DEVICE_STATE_4 = 4; // 故障 + public final static String NEWS_TYPE_1 = "1"; // 1: 要闻;2:速递;3:热搜;4: 重磅; 99:其他 + public final static String NEWS_TYPE_2 = "2"; // 1: 要闻;2:速递;3:热搜;4: 重磅; 99:其他 + public final static String NEWS_TYPE_3 = "3"; // 1: 要闻;2:速递;3:热搜;4: 重磅; 99:其他 + public final static String NEWS_TYPE_4 = "4"; // 1: 要闻;2:速递;3:热搜;4: 重磅; 99:其他 + public final static String NEWS_TYPE_99 = "99"; // 1: 要闻;2:速递;3:热搜;4: 重磅; 99:其他 + + public static Map PLAN_MAP = new HashMap<>(); public static Map LIFE_CYCLE_MAP = new HashMap<>(); public static Map GRID_TYPE = new HashMap<>(); public static Map DEVICE_STATE_MAP = new HashMap<>(); public static Map BINDING_STATE_MAP = new HashMap<>(); + public static Map NEWS_TYPE_MAP = new HashMap<>(); static { PLAN_MAP.put(PLAN_STATUS_1, "未开始"); @@ -64,6 +72,12 @@ public class CommonConstants { BINDING_STATE_MAP.put(0,"未绑定"); BINDING_STATE_MAP.put(1,"已绑定"); + + NEWS_TYPE_MAP.put(NEWS_TYPE_1,"要闻"); + NEWS_TYPE_MAP.put(NEWS_TYPE_2,"速递"); + NEWS_TYPE_MAP.put(NEWS_TYPE_3,"热搜"); + NEWS_TYPE_MAP.put(NEWS_TYPE_4,"重磅"); + NEWS_TYPE_MAP.put(NEWS_TYPE_99,"其他"); } // 模型类型 （1：模型模板； 2：引用案例） diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farminformation/FarmInformationServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farminformation/FarmInformationServiceImpl.java index 470f2286..2ace98bb 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farminformation/FarmInformationServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farminformation/FarmInformationServiceImpl.java @@ -1,11 +1,15 @@ package cn.iocoder.yudao.module.farm.service.farminformation; import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.farmnews.vo.FarmInformationPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.farmnews.vo.FarmInformationPageRespVO; +import cn.iocoder.yudao.module.farm.dal.dataobject.farminformation.FarmInformationDO; import cn.iocoder.yudao.module.farm.dal.mysql.farminformation.FarmInformationMapper; import org.springframework.stereotype.Service; +import static cn.iocoder.yudao.module.farm.enums.CommonConstants.NEWS_TYPE_MAP; + /** * @description: * @author: binda @@ -22,8 +26,12 @@ public class FarmInformationServiceImpl implements FarmInformationService{ @Override public PageResult getFarmInformationPage(FarmInformationPageReqVO req) { - - return null; + PageResult page = farmInformationMapper.selectPage(req); + PageResult result = BeanUtils.toBean(page, FarmInformationPageRespVO.class); + for (FarmInformationPageRespVO e : result.getList()) { + e.setInfoTypeName(NEWS_TYPE_MAP.getOrDefault(e.getInfoType(), "其他")); + } + return result; }