From f079b4bf973e0977ff0e7489d4bdc49b04010dd5 Mon Sep 17 00:00:00 2001 From: masong Date: Fri, 8 Mar 2024 15:36:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/TraceabilityBaseController.java | 5 +++- .../admin/base/vo/TraceabilityBaseRespVO.java | 1 + .../dataobject/base/TraceabilityBaseDO.java | 16 +++++------ .../dal/dataobject/block/BlockDO.java | 2 ++ .../mysql/base/TraceabilityBaseMapper.java | 6 ++++- .../dal/mysql/block/BlockMapper.java | 7 +++++ .../base/TraceabilityBaseServiceImpl.java | 6 ++++- .../service/block/BlockService.java | 6 +++++ .../service/block/BlockServiceImpl.java | 5 ++++ .../mapper/base/TraceabilityBaseMapper.xml | 27 ++++++++++++++++++- 10 files changed, 69 insertions(+), 12 deletions(-) diff --git a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/base/TraceabilityBaseController.java b/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/base/TraceabilityBaseController.java index 9ccfa75..57f5a73 100644 --- a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/base/TraceabilityBaseController.java +++ b/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/base/TraceabilityBaseController.java @@ -1,5 +1,6 @@ package com.cjy.traceability.module.traceability.controller.admin.base; +import com.cjy.traceability.module.traceability.service.block.BlockService; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -37,7 +38,8 @@ public class TraceabilityBaseController { @Resource private TraceabilityBaseService baseService; - + @Resource + private BlockService blockService; @PostMapping("/create") @Operation(summary = "创建基地信息") @PreAuthorize("@ss.hasPermission('traceability:base:create')") @@ -76,6 +78,7 @@ public class TraceabilityBaseController { @PreAuthorize("@ss.hasPermission('traceability:base:query')") public CommonResult> getBasePage(@Valid TraceabilityBasePageReqVO pageReqVO) { PageResult pageResult = baseService.getBasePage(pageReqVO); + return success(BeanUtils.toBean(pageResult, TraceabilityBaseRespVO.class)); } diff --git a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/base/vo/TraceabilityBaseRespVO.java b/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/base/vo/TraceabilityBaseRespVO.java index d56103c..a71bd15 100644 --- a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/base/vo/TraceabilityBaseRespVO.java +++ b/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/base/vo/TraceabilityBaseRespVO.java @@ -77,4 +77,5 @@ public class TraceabilityBaseRespVO { @ExcelProperty("创建时间") private LocalDateTime createTime; + private Integer blockNum; } \ No newline at end of file diff --git a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/dataobject/base/TraceabilityBaseDO.java b/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/dataobject/base/TraceabilityBaseDO.java index 9ea44ec..887d7fb 100644 --- a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/dataobject/base/TraceabilityBaseDO.java +++ b/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/dataobject/base/TraceabilityBaseDO.java @@ -1,14 +1,13 @@ package com.cjy.traceability.module.traceability.dal.dataobject.base; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.cjy.traceability.framework.mybatis.core.dataobject.BaseDO; import lombok.*; -import java.util.*; -import java.math.BigDecimal; -import java.math.BigDecimal; + import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; -import com.cjy.traceability.framework.mybatis.core.dataobject.BaseDO; /** * 基地信息 DO @@ -84,5 +83,6 @@ public class TraceabilityBaseDO extends BaseDO { * 基地图片 */ private String baseImage; - + @TableField(value="blockNum",exist = false) + private Integer blockNum; } \ No newline at end of file diff --git a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/dataobject/block/BlockDO.java b/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/dataobject/block/BlockDO.java index ddb1e99..43c9987 100644 --- a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/dataobject/block/BlockDO.java +++ b/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/dataobject/block/BlockDO.java @@ -51,4 +51,6 @@ public class BlockDO extends BaseDO { */ private String positionStr; + private Integer baseId; + } \ No newline at end of file diff --git a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/mysql/base/TraceabilityBaseMapper.java b/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/mysql/base/TraceabilityBaseMapper.java index 95677b6..955de88 100644 --- a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/mysql/base/TraceabilityBaseMapper.java +++ b/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/mysql/base/TraceabilityBaseMapper.java @@ -2,12 +2,16 @@ package com.cjy.traceability.module.traceability.dal.mysql.base; import java.util.*; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.cjy.traceability.framework.common.pojo.PageResult; import com.cjy.traceability.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cjy.traceability.framework.mybatis.core.mapper.BaseMapperX; +import com.cjy.traceability.module.traceability.controller.admin.block.vo.BlockCropPageReqVO; import com.cjy.traceability.module.traceability.dal.dataobject.base.TraceabilityBaseDO; +import com.cjy.traceability.module.traceability.dal.dataobject.block.BlockCropDO; import org.apache.ibatis.annotations.Mapper; import com.cjy.traceability.module.traceability.controller.admin.base.vo.*; +import org.apache.ibatis.annotations.Param; /** * 基地信息 Mapper @@ -35,5 +39,5 @@ public interface TraceabilityBaseMapper extends BaseMapperX .betweenIfPresent(TraceabilityBaseDO::getCreateTime, reqVO.getCreateTime()) .orderByDesc(TraceabilityBaseDO::getId)); } - + public IPage selectBaseBlockPage(IPage page, @Param("reqVO") TraceabilityBasePageReqVO reqVO); } \ No newline at end of file diff --git a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/mysql/block/BlockMapper.java b/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/mysql/block/BlockMapper.java index 6bd0073..193fbea 100644 --- a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/mysql/block/BlockMapper.java +++ b/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/mysql/block/BlockMapper.java @@ -4,8 +4,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.cjy.traceability.framework.common.pojo.PageResult; import com.cjy.traceability.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cjy.traceability.framework.mybatis.core.mapper.BaseMapperX; +import com.cjy.traceability.framework.mybatis.core.query.MPJLambdaWrapperX; +import com.cjy.traceability.module.traceability.dal.dataobject.base.TraceabilityBaseDO; import com.cjy.traceability.module.traceability.dal.dataobject.block.BlockCropDO; import com.cjy.traceability.module.traceability.dal.dataobject.block.BlockDO; +import com.github.yulichang.query.MPJQueryWrapper; +import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.ibatis.annotations.Mapper; import com.cjy.traceability.module.traceability.controller.admin.block.vo.*; import org.apache.ibatis.annotations.Param; @@ -31,4 +35,7 @@ public interface BlockMapper extends BaseMapperX { public IPage selectBlockCropPage(IPage page, @Param("reqVO") BlockCropPageReqVO reqVO); + default Long selectBlockNumBaseId(Integer baseId){ + return selectCount(BlockDO::getBaseId,baseId); + } } \ No newline at end of file diff --git a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/base/TraceabilityBaseServiceImpl.java b/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/base/TraceabilityBaseServiceImpl.java index 2e5a119..48ad842 100644 --- a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/base/TraceabilityBaseServiceImpl.java +++ b/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/base/TraceabilityBaseServiceImpl.java @@ -1,5 +1,7 @@ package com.cjy.traceability.module.traceability.service.base; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -68,7 +70,9 @@ public class TraceabilityBaseServiceImpl implements TraceabilityBaseService { @Override public PageResult getBasePage(TraceabilityBasePageReqVO pageReqVO) { - return baseMapper.selectPage(pageReqVO); + IPage page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); + baseMapper.selectBaseBlockPage(page,pageReqVO); + return new PageResult<>(page.getRecords(),page.getTotal()); } } \ No newline at end of file diff --git a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/block/BlockService.java b/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/block/BlockService.java index 740dc8d..f5c7f77 100644 --- a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/block/BlockService.java +++ b/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/block/BlockService.java @@ -53,4 +53,10 @@ public interface BlockService { PageResult getBlockCropPage(BlockCropPageReqVO pageReqVO); + /** + * 根据基地id 查询土地块数 + * @param baseId + * @return + */ + Long selectBlockNuMbyBaseId(Integer baseId); } \ No newline at end of file diff --git a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/block/BlockServiceImpl.java b/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/block/BlockServiceImpl.java index 307e0bd..3fe3f9c 100644 --- a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/block/BlockServiceImpl.java +++ b/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/block/BlockServiceImpl.java @@ -81,4 +81,9 @@ public class BlockServiceImpl implements BlockService { return new PageResult<>(pages.getRecords(),pages.getTotal()); } + @Override + public Long selectBlockNuMbyBaseId(Integer baseId) { + return blockMapper.selectBlockNumBaseId(baseId); + } + } \ No newline at end of file diff --git a/cjy-module-traceability/cjy-module-traceability-biz/src/main/resources/mapper/base/TraceabilityBaseMapper.xml b/cjy-module-traceability/cjy-module-traceability-biz/src/main/resources/mapper/base/TraceabilityBaseMapper.xml index 3a39927..8e5d178 100644 --- a/cjy-module-traceability/cjy-module-traceability-biz/src/main/resources/mapper/base/TraceabilityBaseMapper.xml +++ b/cjy-module-traceability/cjy-module-traceability-biz/src/main/resources/mapper/base/TraceabilityBaseMapper.xml @@ -8,5 +8,30 @@ 代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - + + + + + + + + + + + + + + + + + + + \ No newline at end of file