地块模块

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/block/BlockController.java

@@ -1,5 +1,6 @@
 package com.cjy.traceability.module.traceability.controller.admin.block;
 
+import com.cjy.traceability.module.traceability.dal.dataobject.block.BlockCropDO;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -74,9 +75,9 @@ public class BlockController {
     @GetMapping("/page")
     @Operation(summary = "获得地块信息分页")
     @PreAuthorize("@ss.hasPermission('traceability:block:query')")
-    public CommonResult<PageResult<BlockRespVO>> getBlockPage(@Valid BlockPageReqVO pageReqVO) {
-        PageResult<BlockDO> pageResult = blockService.getBlockPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, BlockRespVO.class));
+    public CommonResult<PageResult<BlockCropVO>> getBlockPage(@Valid BlockCropPageReqVO pageReqVO) {
+        PageResult<BlockCropDO> pageResult = blockService.getBlockCropPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, BlockCropVO.class));
     }
 
     @GetMapping("/export-excel")

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/block/vo/BlockCropPageReqVO.java

@@ -2,22 +2,19 @@ package com.cjy.traceability.module.traceability.controller.admin.block.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.cjy.traceability.framework.common.pojo.PageParam;
 import com.cjy.traceability.framework.excel.core.annotations.DictFormat;
 import com.cjy.traceability.framework.excel.core.convert.DictConvert;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
 /**
  * 地块农作物相关信息
  */
 @Schema(description = "管理后台 - 地块作物信息 Response VO")
 @Data
 @ExcelIgnoreUnannotated
-public class BlockCropReqVO {
+public class BlockCropPageReqVO extends PageParam {
 
     @Schema(description = "地块名", example = "张三")
     @ExcelProperty("地块名")

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/block/vo/BlockCropVO.java

@@ -0,0 +1,73 @@
+package com.cjy.traceability.module.traceability.controller.admin.block.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.cjy.traceability.framework.common.pojo.PageParam;
+import com.cjy.traceability.framework.excel.core.annotations.DictFormat;
+import com.cjy.traceability.framework.excel.core.convert.DictConvert;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 地块农作物相关信息
+ */
+@Schema(description = "管理后台 - 地块作物信息 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class BlockCropVO extends PageParam {
+
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "3899")
+    @ExcelProperty("主键ID")
+    private Integer id;
+    /**
+     * 地块名
+     */
+    @Schema(description = "名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @ExcelProperty("名称")
+    private String blockName;
+    /**
+     * 标识颜色
+     */
+    @Schema(description = "标识颜色", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @ExcelProperty("标识颜色")
+    private String blockColor;
+    /**
+     * 地块类型
+     * <p>
+     * 枚举 {@link  land_type 对应的类}
+     */
+    @Schema(description = "地块类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @ExcelProperty("地块类型")
+    private String blockType;
+    /**
+     * 地块面积
+     */
+    @Schema(description = "地块面积", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @ExcelProperty("地块面积")
+    private BigDecimal blockArea;
+    /**
+     * 经纬度信息
+     */
+    @Schema(description = "经纬度信息", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @ExcelProperty("经纬度信息")
+    private String positionStr;
+    /**
+     * 种养类型
+     */
+    @Schema(description = "种养类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @ExcelProperty("种养类型")
+    private Integer speciesId;
+    /**
+     * 认证图片
+     */
+    @Schema(description = "认证图片", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @ExcelProperty("认证图片")
+    private String authenticationPic;
+
+}

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/block/BlockService.java

@@ -1,12 +1,10 @@
 package com.cjy.traceability.module.traceability.service.block;
 
-import java.util.*;
 import javax.validation.*;
 import com.cjy.traceability.module.traceability.controller.admin.block.vo.*;
 import com.cjy.traceability.module.traceability.dal.dataobject.block.BlockCropDO;
 import com.cjy.traceability.module.traceability.dal.dataobject.block.BlockDO;
 import com.cjy.traceability.framework.common.pojo.PageResult;
-import com.cjy.traceability.framework.common.pojo.PageParam;
 
 /**
  * 地块信息 Service 接口
@@ -53,6 +51,6 @@ public interface BlockService {
      */
     PageResult<BlockDO> getBlockPage(BlockPageReqVO pageReqVO);
 
-    PageResult<BlockCropDO> getBlockCropPage(BlockCropReqVO pageReqVO);
+    PageResult<BlockCropDO> getBlockCropPage(BlockCropPageReqVO pageReqVO);
 
 }

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/block/BlockServiceImpl.java

@@ -1,22 +1,22 @@
 package com.cjy.traceability.module.traceability.service.block;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.cjy.traceability.framework.common.pojo.PageResult;
+import com.cjy.traceability.framework.common.util.object.BeanUtils;
+import com.cjy.traceability.module.traceability.controller.admin.block.vo.BlockCropPageReqVO;
+import com.cjy.traceability.module.traceability.controller.admin.block.vo.BlockPageReqVO;
+import com.cjy.traceability.module.traceability.controller.admin.block.vo.BlockSaveReqVO;
 import com.cjy.traceability.module.traceability.dal.dataobject.block.BlockCropDO;
+import com.cjy.traceability.module.traceability.dal.dataobject.block.BlockDO;
+import com.cjy.traceability.module.traceability.dal.mysql.block.BlockMapper;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import com.cjy.traceability.module.traceability.controller.admin.block.vo.*;
-import com.cjy.traceability.module.traceability.dal.dataobject.block.BlockDO;
-import com.cjy.traceability.framework.common.pojo.PageResult;
-import com.cjy.traceability.framework.common.pojo.PageParam;
-import com.cjy.traceability.framework.common.util.object.BeanUtils;
 
-import com.cjy.traceability.module.traceability.dal.mysql.block.BlockMapper;
+import javax.annotation.Resource;
 
 import static com.cjy.traceability.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.cjy.traceability.module.traceability.enums.ErrorCodeConstants.*;
+import static com.cjy.traceability.module.traceability.enums.ErrorCodeConstants.BLOCK_NOT_EXISTS;
 
 /**
  * 地块信息 Service 实现类
@@ -74,8 +74,11 @@ public class BlockServiceImpl implements BlockService {
     }
 
     @Override
-    public PageResult<BlockCropDO> getBlockCropPage(BlockCropReqVO pageReqVO) {
-        return blockMapper.selectBlockCropPage(pageReqVO);
+    public PageResult<BlockCropDO> getBlockCropPage(BlockCropPageReqVO pageReqVO) {
+
+        IPage<BlockCropDO> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
+        IPage<BlockCropDO> pages =   blockMapper.selectBlockCropPage(page,pageReqVO);
+        return  new PageResult<>(pages.getRecords(),pages.getTotal());
     }
 
 }

cjy-server/src/main/resources/application-local.yaml

@@ -188,7 +188,7 @@ logging:
     com.cjy.traceability.module.promotion.dal.mysql: debug
     com.cjy.traceability.module.statistics.dal.mysql: debug
     com.cjy.traceability.module.crm.dal.mysql: debug
-    com.cjy.traceability.module.erp.dal.mysql: debug
+    com.cjy.traceability.module.traceability.dal.mysql: debug
     org.springframework.context.support.PostProcessorRegistrationDelegate: ERROR # TODO 芋艿：先禁用，Spring Boot 3.X 存在部分错误的 WARN 提示
 
 debug: false