feat(garden): 添加物料管理重复校验和模糊搜索功能

- 新增物料名称、规格、单位重复校验逻辑 - 添加MATERIAL_NAME_EXISTS、MATERIAL_SPECIFICATION_NAME_EXISTS、MATERIAL_UNIT_NAME_EXISTS错误码 - 实现物料名称、规格、单位的模糊搜索接口 - 修改道路拦截查询的排序逻辑 - 优化代码结构并移除未使用的导入

feat(garden): 添加物料管理重复校验和模糊搜索功能
- 新增物料名称、规格、单位重复校验逻辑 - 添加MATERIAL_NAME_EXISTS、MATERIAL_SPECIFICATION_NAME_EXISTS、MATERIAL_UNIT_NAME_EXISTS错误码 - 实现物料名称、规格、单位的模糊搜索接口 - 修改道路拦截查询的排序逻辑 - 优化代码结构并移除未使用的导入
王彪总
1 parent 2e849fc3
Showing 9 changed files with 118 additions and 18 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/materialname/MaterialNameController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/materialspecification/MaterialSpecificationController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/materialunit/MaterialUnitController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/materialspecification/MaterialSpecificationMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/road/RoadInterceptMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/enums/ErrorCodeConstants.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialname/MaterialNameServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialspecification/MaterialSpecificationServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/materialunit/MaterialUnitServiceImpl.java
@@ -88,6 +88,21 @@ public class MaterialNameController {
         return success(BeanUtils.toBean(pageResult, MaterialNameRespVO.class));
     }
+    @GetMapping("/list")
+    @Operation(summary = "获得物料名称列表（支持模糊搜索）")
+    @PreAuthorize("@ss.hasPermission('garden:material-name:query')")
+    public CommonResult<List<MaterialNameRespVO>> getMaterialNameList(
+            @RequestParam(value = "materialName", required = false) String materialName) {
+        // 构建查询条件
+        MaterialNamePageReqVO pageReqVO = new MaterialNamePageReqVO();
+        pageReqVO.setMaterialName(materialName);
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        
+        // 查询数据
+        List<MaterialNameDO> list = materialNameService.getMaterialNamePage(pageReqVO).getList();
+        return success(BeanUtils.toBean(list, MaterialNameRespVO.class));
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出物料名称 Excel")
     @PreAuthorize("@ss.hasPermission('garden:material-name:export')")
@@ -88,6 +88,21 @@ public class MaterialSpecificationController {
         return success(BeanUtils.toBean(pageResult, MaterialSpecificationRespVO.class));
     }
+    @GetMapping("/list")
+    @Operation(summary = "获得物料规格列表（支持模糊搜索）")
+    @PreAuthorize("@ss.hasPermission('garden:material-specification:query')")
+    public CommonResult<List<MaterialSpecificationRespVO>> getMaterialSpecificationList(
+            @RequestParam(value = "specifications", required = false) String specifications) {
+        // 构建查询条件
+        MaterialSpecificationPageReqVO pageReqVO = new MaterialSpecificationPageReqVO();
+        pageReqVO.setSpecifications(specifications);
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        
+        // 查询数据
+        List<MaterialSpecificationDO> list = materialSpecificationService.getMaterialSpecificationPage(pageReqVO).getList();
+        return success(BeanUtils.toBean(list, MaterialSpecificationRespVO.class));
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出物料规格 Excel")
     @PreAuthorize("@ss.hasPermission('garden:material-specification:export')")
@@ -88,6 +88,21 @@ public class MaterialUnitController {
         return success(BeanUtils.toBean(pageResult, MaterialUnitRespVO.class));
     }
+    @GetMapping("/list")
+    @Operation(summary = "获得物料单位列表（支持模糊搜索）")
+    @PreAuthorize("@ss.hasPermission('garden:material-unit:query')")
+    public CommonResult<List<MaterialUnitRespVO>> getMaterialUnitList(
+            @RequestParam(value = "unitName", required = false) String unitName) {
+        // 构建查询条件
+        MaterialUnitPageReqVO pageReqVO = new MaterialUnitPageReqVO();
+        pageReqVO.setUnitName(unitName);
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        
+        // 查询数据
+        List<MaterialUnitDO> list = materialUnitService.getMaterialUnitPage(pageReqVO).getList();
+        return success(BeanUtils.toBean(list, MaterialUnitRespVO.class));
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出物料单位 Excel")
     @PreAuthorize("@ss.hasPermission('garden:material-unit:export')")
@@ -20,7 +20,7 @@ public interface MaterialSpecificationMapper extends BaseMapperX&lt;MaterialSpecifi
     default PageResult<MaterialSpecificationDO> selectPage(MaterialSpecificationPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<MaterialSpecificationDO>()
                 .eqIfPresent(MaterialSpecificationDO::getSpecCode, reqVO.getSpecCode())
-                .eqIfPresent(MaterialSpecificationDO::getSpecifications, reqVO.getSpecifications())
+                .likeIfPresent(MaterialSpecificationDO::getSpecifications, reqVO.getSpecifications())
                 .eqIfPresent(MaterialSpecificationDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(MaterialSpecificationDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(MaterialSpecificationDO::getDeptId, reqVO.getDeptId())
@@ -43,10 +43,10 @@ public interface RoadInterceptMapper extends BaseMapperX&lt;RoadDO&gt; {
                 .likeIfPresent(RoadDO::getCreatorName, reqVO.getCreatorName())
                 .betweenIfPresent(RoadDO::getCreateTime, reqVO.getCreateTime())
                 .likeIfPresent(RoadDO::getUpdaterName, reqVO.getUpdaterName())
-                .orderBy(true, reqVO.getSortAsc(),
+                .orderBy(false, reqVO.getSortAsc(),
                         RoadPageReqVO.SORT_FIELD_MAP.get(reqVO.getOrderByColumn())
                 )
         );
     }
-}
 \ No newline at end of file
+}
@@ -115,9 +115,13 @@ public interface ErrorCodeConstants {
     ErrorCode MATERIAL_INVENTORY_OUT_NOT_EXISTS = new ErrorCode(1-100-004-005, "物料出库不存在");
     ErrorCode MATERIAL_INVENTORY_NOT_EXISTS = new ErrorCode(1-100-004-006, "物料库存不存在");
     ErrorCode MATERIAL_NAME_NOT_EXISTS = new ErrorCode(1-100-004-007, "物料名称不存在");
+    ErrorCode MATERIAL_NAME_EXISTS = new ErrorCode(1-100-004-0013, "物料名称已经存在");
     ErrorCode MATERIAL_SPECIFICATION_NOT_EXISTS = new ErrorCode(1-100-004-010, "物料规格不存在");
+    ErrorCode MATERIAL_SPECIFICATION_NAME_EXISTS = new ErrorCode(1-100-004-014, "物料规格名称已经存在");
+
     ErrorCode MATERIAL_UNIT_NOT_EXISTS = new ErrorCode(1-100-004-011, "物料单位不存在");
+    ErrorCode MATERIAL_UNIT_NAME_EXISTS = new ErrorCode(1-100-004-012, "物料单位名称存在");
     ErrorCode OLDTREES_NOT_EXISTS = new ErrorCode(1-100-005-001, "古树名木不存在");
@@ -17,7 +17,7 @@ import com.zteits.urbanops.module.garden.dal.mysql.materialname.MaterialNameMapp
 import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.convertList;
-import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.diffList;
+import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX;
 import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.*;
 /**
@@ -34,9 +34,12 @@ public class MaterialNameServiceImpl implements MaterialNameService {
     @Override
     public Long createMaterialName(MaterialNameSaveReqVO createReqVO) {
+        // 校验物料名称是否重复
+        validateMaterialNameUnique(null, createReqVO.getMaterialName());
+
         // 生成物料名称ID：获取数据库中最大的值然后+1
         Long materialId = generateMaterialId();
-        
+
         // 插入
         MaterialNameDO materialName = BeanUtils.toBean(createReqVO, MaterialNameDO.class);
         materialName.setMaterialId(materialId);
@@ -53,7 +56,7 @@ public class MaterialNameServiceImpl implements MaterialNameService {
     private Long generateMaterialId() {
         // 获取所有物料名称
         List<MaterialNameDO> allMaterials = materialNameMapper.selectList();
-        
+
         long maxId = 0;
         if (CollUtil.isNotEmpty(allMaterials)) {
             // 遍历找到最大的ID值
@@ -63,7 +66,7 @@ public class MaterialNameServiceImpl implements MaterialNameService {
                 }
             }
         }
-        
+
         // 生成新ID：最大ID+1
         return maxId + 1;
     }
@@ -72,11 +75,25 @@ public class MaterialNameServiceImpl implements MaterialNameService {
     public void updateMaterialName(MaterialNameSaveReqVO updateReqVO) {
         // 校验存在
         validateMaterialNameExists(updateReqVO.getId());
+        // 校验物料名称是否重复
+        validateMaterialNameUnique(updateReqVO.getId(), updateReqVO.getMaterialName());
         // 更新
         MaterialNameDO updateObj = BeanUtils.toBean(updateReqVO, MaterialNameDO.class);
         materialNameMapper.updateById(updateObj);
     }
+    /**
+     * 校验物料名称是否唯一
+     */
+    private void validateMaterialNameUnique(Long id, String materialName) {
+        List<MaterialNameDO> existingMaterials = materialNameMapper.selectList(new LambdaQueryWrapperX<MaterialNameDO>()
+                .eq(MaterialNameDO::getMaterialName, materialName)
+                .neIfPresent(MaterialNameDO::getId, id));
+        if (CollUtil.isNotEmpty(existingMaterials)) {
+            throw exception(MATERIAL_NAME_EXISTS);
+        }
+    }
+
     @Override
     public void deleteMaterialName(Long id) {
         // 校验存在
@@ -108,4 +125,4 @@ public class MaterialNameServiceImpl implements MaterialNameService {
         return materialNameMapper.selectPage(pageReqVO);
     }
-}
 \ No newline at end of file
+}
@@ -17,7 +17,7 @@ import com.zteits.urbanops.module.garden.dal.mysql.materialspecification.Materia
 import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.convertList;
-import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.diffList;
+import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX;
 import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.*;
 /**
@@ -34,9 +34,12 @@ public class MaterialSpecificationServiceImpl implements MaterialSpecificationSe
     @Override
     public Long createMaterialSpecification(MaterialSpecificationSaveReqVO createReqVO) {
+        // 校验规格名称是否重复
+        validateSpecificationsUnique(null, createReqVO.getSpecifications());
+
         // 生成规格编码：获取数据库中最大的值然后+1
         String specCode = generateSpecCode();
-        
+
         // 插入
         MaterialSpecificationDO materialSpecification = BeanUtils.toBean(createReqVO, MaterialSpecificationDO.class);
         materialSpecification.setSpecCode(specCode);
@@ -53,7 +56,7 @@ public class MaterialSpecificationServiceImpl implements MaterialSpecificationSe
     private String generateSpecCode() {
         // 获取所有物料规格
         List<MaterialSpecificationDO> allSpecifications = materialSpecificationMapper.selectList();
-        
+
         int maxCode = 0;
         if (CollUtil.isNotEmpty(allSpecifications)) {
             // 遍历找到最大的编码
@@ -70,7 +73,7 @@ public class MaterialSpecificationServiceImpl implements MaterialSpecificationSe
                 }
             }
         }
-        
+
         // 生成新编码：最大编码+1
         return String.valueOf(maxCode + 1);
     }
@@ -79,11 +82,25 @@ public class MaterialSpecificationServiceImpl implements MaterialSpecificationSe
     public void updateMaterialSpecification(MaterialSpecificationSaveReqVO updateReqVO) {
         // 校验存在
         validateMaterialSpecificationExists(updateReqVO.getId());
+        // 校验规格名称是否重复
+        validateSpecificationsUnique(updateReqVO.getId(), updateReqVO.getSpecifications());
         // 更新
         MaterialSpecificationDO updateObj = BeanUtils.toBean(updateReqVO, MaterialSpecificationDO.class);
         materialSpecificationMapper.updateById(updateObj);
     }
+    /**
+     * 校验规格名称是否唯一
+     */
+    private void validateSpecificationsUnique(Long id, String specifications) {
+        List<MaterialSpecificationDO> existingSpecifications = materialSpecificationMapper.selectList(new LambdaQueryWrapperX<MaterialSpecificationDO>()
+                .eq(MaterialSpecificationDO::getSpecifications, specifications)
+                .neIfPresent(MaterialSpecificationDO::getId, id));
+        if (CollUtil.isNotEmpty(existingSpecifications)) {
+            throw exception(MATERIAL_SPECIFICATION_NAME_EXISTS);
+        }
+    }
+
     @Override
     public void deleteMaterialSpecification(Long id) {
         // 校验存在
@@ -115,4 +132,4 @@ public class MaterialSpecificationServiceImpl implements MaterialSpecificationSe
         return materialSpecificationMapper.selectPage(pageReqVO);
     }
-}
 \ No newline at end of file
+}
@@ -17,7 +17,7 @@ import com.zteits.urbanops.module.garden.dal.mysql.materialunit.MaterialUnitMapp
 import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.convertList;
-import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.diffList;
+import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX;
 import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.*;
 /**
@@ -34,9 +34,12 @@ public class MaterialUnitServiceImpl implements MaterialUnitService {
     @Override
     public Long createMaterialUnit(MaterialUnitSaveReqVO createReqVO) {
+        // 校验单位名称是否重复
+        validateUnitNameUnique(null, createReqVO.getUnitName());
+
         // 生成单位ID：获取数据库中最大的值然后+1
         Long unitId = generateUnitId();
-        
+
         // 插入
         MaterialUnitDO materialUnit = BeanUtils.toBean(createReqVO, MaterialUnitDO.class);
         materialUnit.setUnitId(unitId);
@@ -53,7 +56,7 @@ public class MaterialUnitServiceImpl implements MaterialUnitService {
     private Long generateUnitId() {
         // 获取所有物料单位
         List<MaterialUnitDO> allUnits = materialUnitMapper.selectList();
-        
+
         long maxId = 0;
         if (CollUtil.isNotEmpty(allUnits)) {
             // 遍历找到最大的ID值
@@ -63,7 +66,7 @@ public class MaterialUnitServiceImpl implements MaterialUnitService {
                 }
             }
         }
-        
+
         // 生成新ID：最大ID+1
         return maxId + 1;
     }
@@ -72,11 +75,25 @@ public class MaterialUnitServiceImpl implements MaterialUnitService {
     public void updateMaterialUnit(MaterialUnitSaveReqVO updateReqVO) {
         // 校验存在
         validateMaterialUnitExists(updateReqVO.getId());
+        // 校验单位名称是否重复
+        validateUnitNameUnique(updateReqVO.getId(), updateReqVO.getUnitName());
         // 更新
         MaterialUnitDO updateObj = BeanUtils.toBean(updateReqVO, MaterialUnitDO.class);
         materialUnitMapper.updateById(updateObj);
     }
+    /**
+     * 校验单位名称是否唯一
+     */
+    private void validateUnitNameUnique(Long id, String unitName) {
+        List<MaterialUnitDO> existingUnits = materialUnitMapper.selectList(new LambdaQueryWrapperX<MaterialUnitDO>()
+                .eq(MaterialUnitDO::getUnitName, unitName)
+                .neIfPresent(MaterialUnitDO::getId, id));
+        if (CollUtil.isNotEmpty(existingUnits)) {
+            throw exception(MATERIAL_UNIT_NAME_EXISTS);
+        }
+    }
+
     @Override
     public void deleteMaterialUnit(Long id) {
         // 校验存在
@@ -108,4 +125,4 @@ public class MaterialUnitServiceImpl implements MaterialUnitService {
         return materialUnitMapper.selectPage(pageReqVO);
     }
-}
 \ No newline at end of file
+}