fix (farm): 微信端资讯
- 资讯分页
This commit is contained in:
@@ -12,5 +12,6 @@ import lombok.Data;
|
|||||||
public class FarmInformationPageReqVO extends PageParam {
|
public class FarmInformationPageReqVO extends PageParam {
|
||||||
|
|
||||||
private String id;
|
private String id;
|
||||||
|
private String infoTitle;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -195,7 +195,6 @@ public class WxController {
|
|||||||
@Operation(summary = "农业资讯")
|
@Operation(summary = "农业资讯")
|
||||||
@GetMapping("/farm-information/page")
|
@GetMapping("/farm-information/page")
|
||||||
public CommonResult<PageResult<FarmInformationPageRespVO>> getFarmInformation(@Valid FarmInformationPageReqVO req) {
|
public CommonResult<PageResult<FarmInformationPageRespVO>> getFarmInformation(@Valid FarmInformationPageReqVO req) {
|
||||||
// TODO: 2025/10/13 待实现
|
|
||||||
PageResult<FarmInformationPageRespVO> result = farmInformationService.getFarmInformationPage(req);
|
PageResult<FarmInformationPageRespVO> result = farmInformationService.getFarmInformationPage(req);
|
||||||
return CommonResult.success(result);
|
return CommonResult.success(result);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,12 @@
|
|||||||
package cn.iocoder.yudao.module.farm.dal.mysql.farminformation;
|
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.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 cn.iocoder.yudao.module.farm.dal.dataobject.farminformation.FarmInformationDO;
|
||||||
import org.apache.ibatis.annotations.Mapper;
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
|
|
||||||
@@ -12,4 +18,9 @@ import org.apache.ibatis.annotations.Mapper;
|
|||||||
@Mapper
|
@Mapper
|
||||||
public interface FarmInformationMapper extends BaseMapperX<FarmInformationDO> {
|
public interface FarmInformationMapper extends BaseMapperX<FarmInformationDO> {
|
||||||
|
|
||||||
|
default PageResult<FarmInformationDO> selectPage(FarmInformationPageReqVO reqVO) {
|
||||||
|
return selectPage(reqVO, new LambdaQueryWrapperX<FarmInformationDO>()
|
||||||
|
.likeIfPresent(FarmInformationDO::getInfoTitle, reqVO.getInfoTitle())
|
||||||
|
.orderByDesc(FarmInformationDO::getCreateTime));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,12 +33,20 @@ public class CommonConstants {
|
|||||||
public final static Integer DEVICE_STATE_3 = 3; // 维护中
|
public final static Integer DEVICE_STATE_3 = 3; // 维护中
|
||||||
public final static Integer DEVICE_STATE_4 = 4; // 故障
|
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<Integer, String> PLAN_MAP = new HashMap<>();
|
public static Map<Integer, String> PLAN_MAP = new HashMap<>();
|
||||||
public static Map<String, String> LIFE_CYCLE_MAP = new HashMap<>();
|
public static Map<String, String> LIFE_CYCLE_MAP = new HashMap<>();
|
||||||
public static Map<String, String> GRID_TYPE = new HashMap<>();
|
public static Map<String, String> GRID_TYPE = new HashMap<>();
|
||||||
public static Map<Integer,String> DEVICE_STATE_MAP = new HashMap<>();
|
public static Map<Integer,String> DEVICE_STATE_MAP = new HashMap<>();
|
||||||
public static Map<Integer,String> BINDING_STATE_MAP = new HashMap<>();
|
public static Map<Integer,String> BINDING_STATE_MAP = new HashMap<>();
|
||||||
|
public static Map<String,String> NEWS_TYPE_MAP = new HashMap<>();
|
||||||
|
|
||||||
static {
|
static {
|
||||||
PLAN_MAP.put(PLAN_STATUS_1, "未开始");
|
PLAN_MAP.put(PLAN_STATUS_1, "未开始");
|
||||||
@@ -64,6 +72,12 @@ public class CommonConstants {
|
|||||||
|
|
||||||
BINDING_STATE_MAP.put(0,"未绑定");
|
BINDING_STATE_MAP.put(0,"未绑定");
|
||||||
BINDING_STATE_MAP.put(1,"已绑定");
|
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:引用案例)
|
// 模型类型 (1:模型模板; 2:引用案例)
|
||||||
|
|||||||
@@ -1,11 +1,15 @@
|
|||||||
package cn.iocoder.yudao.module.farm.service.farminformation;
|
package cn.iocoder.yudao.module.farm.service.farminformation;
|
||||||
|
|
||||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
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.FarmInformationPageReqVO;
|
||||||
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.farmnews.vo.FarmInformationPageRespVO;
|
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 cn.iocoder.yudao.module.farm.dal.mysql.farminformation.FarmInformationMapper;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import static cn.iocoder.yudao.module.farm.enums.CommonConstants.NEWS_TYPE_MAP;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @description:
|
* @description:
|
||||||
* @author: binda
|
* @author: binda
|
||||||
@@ -22,8 +26,12 @@ public class FarmInformationServiceImpl implements FarmInformationService{
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public PageResult<FarmInformationPageRespVO> getFarmInformationPage(FarmInformationPageReqVO req) {
|
public PageResult<FarmInformationPageRespVO> getFarmInformationPage(FarmInformationPageReqVO req) {
|
||||||
|
PageResult<FarmInformationDO> page = farmInformationMapper.selectPage(req);
|
||||||
return null;
|
PageResult<FarmInformationPageRespVO> result = BeanUtils.toBean(page, FarmInformationPageRespVO.class);
|
||||||
|
for (FarmInformationPageRespVO e : result.getList()) {
|
||||||
|
e.setInfoTypeName(NEWS_TYPE_MAP.getOrDefault(e.getInfoType(), "其他"));
|
||||||
|
}
|
||||||
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user