farm模块-字典优化

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/vo/DisasterDataPageReqVO.java

@@ -1,21 +1,12 @@
 package cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo;
 
-import lombok.*;
-
-import io.swagger.v3.oas.annotations.media.Schema;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
-import java.time.LocalDateTime;
+import lombok.Data;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Schema(description = "管理后台 - 灾害数据分页 Request VO")
 @Data
-public class DisasterDataPageReqVO {
+public class DisasterDataPageReqVO extends PageParam {
-
-    private Integer pageNo;
-    private Integer pageSize;
-    private Integer offset;
 
     @Schema(description = "灾害名称", example = "赵六")
     private String name;

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/disasterdata/DisasterDataDO.java

@@ -35,7 +35,7 @@ public class DisasterDataDO extends BaseDO {
     /**
      * 灾害类型 2=病害，1=虫害，3=草害
      */
-    private int category;
+    private Integer category;
     private String categoryName;
     /**
      * 灾害类别 1：普通； 2：气象灾害

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/disasterdata/DisasterDataMapper.java

@@ -1,7 +1,12 @@
 package cn.iocoder.yudao.module.farm.dal.mysql.disasterdata;
 
+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.deviceplotrelation.vo.DevicePlotRelationPageReqVO;
 import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.DisasterDataReqVO;
 import cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo.DisasterDataPageReqVO;
+import cn.iocoder.yudao.module.farm.dal.dataobject.deviceplotrelation.DevicePlotRelationDO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.disasterdata.DisasterDataDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -14,7 +19,7 @@ import java.util.List;
  * @author 芋道源码
  */
 @Mapper
-public interface DisasterDataMapper  {
+public interface DisasterDataMapper extends BaseMapperX<DisasterDataDO> {
 
     List<DisasterDataDO> selectDisasterDataPage(@Param("req") DisasterDataPageReqVO reqVO);
 
@@ -26,10 +31,19 @@ public interface DisasterDataMapper  {
 
     void deleteById(String id);
 
-    void updateById(DisasterDataDO updateObj);
+    int updateById(DisasterDataDO updateObj);
 
-    void insert(DisasterDataDO disasterData);
+    int insert(DisasterDataDO disasterData);
 
     DisasterDataDO selectOne(DisasterDataReqVO reqVO);
+
     List<DisasterDataDO> selectMore(DisasterDataReqVO reqVO);
+
+    default PageResult<DisasterDataDO> selectPage(DisasterDataPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<DisasterDataDO>()
+                .eqIfPresent(DisasterDataDO::getType, reqVO.getType())
+                .eqIfPresent(DisasterDataDO::getCategory, reqVO.getCategory())
+                .eqIfPresent(DisasterDataDO::getUseStatus, reqVO.getUseStatus())
+                .orderByDesc(DisasterDataDO::getCreateTime));
+    }
 }

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/disasterdata/DisasterDataServiceImpl.java

@@ -14,6 +14,7 @@ import cn.iocoder.yudao.module.farm.dal.mysql.sysDict.SysDictMapper;
 import cn.iocoder.yudao.module.farm.enums.CommonConstants;
 import cn.iocoder.yudao.module.farm.framework.util.ImageCollectionUtil;
 import cn.iocoder.yudao.module.farm.utils.StrHelperUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import jakarta.annotation.Resource;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.stereotype.Service;
@@ -234,35 +235,7 @@ public class DisasterDataServiceImpl implements DisasterDataService {
 
     @Override
     public PageResult<DisasterDataDO> getDisasterDataPage(DisasterDataPageReqVO reqVO) {
-
+        return disasterDataMapper.selectPage(reqVO);
-        List<SysDictDO> dictList = sysDictMapper.getByTypeCode(DICT_TYPE_CODE_1);
-        Map<String, String> dictMap = dictList.stream()
-                .collect(Collectors.toMap(
-                        SysDictDO::getField1Code,  // key: field1Code
-                        SysDictDO::getField1Name,  // value: field1Name
-                        (existing, replacement) -> existing // 处理重复key，保留现有值
-                ));
-
-        Integer pageNo = reqVO.getPageNo();
-        Integer pageSize = reqVO.getPageSize();
-
-        // 计算偏移量
-        int offset = (pageNo - 1) * pageSize;
-        reqVO.setOffset(offset);
-        List<DisasterDataDO> list = disasterDataMapper.selectDisasterDataPage(reqVO);
-        if (list != null) {
-            list.forEach(item -> {
-                if (item != null) {
-                    // 触发图片集合转换
-                    item.getImageList();
-                    item.setCategoryName(dictMap.get(item.getCategory()));
-                }
-            });
-        }
-
-        long total = disasterDataMapper.selectDisasterDataCount(reqVO);
-
-        return new PageResult<>(list, total);
     }
 
 }

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/specieslibrary/SpeciesLibraryServiceImpl.java

@@ -115,7 +115,7 @@ public class SpeciesLibraryServiceImpl implements SpeciesLibraryService {
         updateObj.setSpeciesName(twoDict.getName() + "/" + dictDO.getName());
         speciesLibraryMapper.updateById(updateObj);
         // 同步
-        this.syncUpdateDict(updateObj.getId());
+//        this.syncUpdateDict(updateObj.getId());
     }
 
     private void syncUpdateDict(String id) {