From f6a6957753cc69f2d613fd2918e778f13c2f7c96 Mon Sep 17 00:00:00 2001
From: yanps <yps00312>
Date: Thu, 7 Dec 2023 11:11:15 +0800
Subject: [PATCH] fix: materialbase

---
 .../rest/MaterialbaseController.java          | 21 +++++++++++++
 .../service/MaterialbaseService.java          | 31 ++++++++++++++++++-
 .../service/impl/MaterialbaseServiceImpl.java |  4 ---
 3 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/rest/MaterialbaseController.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/rest/MaterialbaseController.java
index add1748..7dfc1bd 100644
--- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/rest/MaterialbaseController.java
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/rest/MaterialbaseController.java
@@ -27,6 +27,12 @@ public class MaterialbaseController {
 
     private final MaterialbaseService materialbaseService;
 
+    /**
+     * 查询物料基本信息
+     * @param query
+     * @param pageable
+     * @return
+     */
     @GetMapping
     @Log("查询物料基本信息")
     @ApiOperation("查询物料基本信息")
@@ -35,6 +41,11 @@ public class MaterialbaseController {
         return new ResponseEntity<>(materialbaseService.queryAll(query, pageable), HttpStatus.OK);
     }
 
+    /**
+     * 新增物料基本信息
+     * @param resources
+     * @return
+     */
     @PostMapping
     @Log("新增物料基本信息")
     @ApiOperation("新增物料基本信息")
@@ -43,6 +54,11 @@ public class MaterialbaseController {
         return new ResponseEntity<>(materialbaseService.insert(resources), HttpStatus.CREATED);
     }
 
+    /**
+     * 修改物料基本信息
+     * @param resources
+     * @return
+     */
     @PutMapping
     @Log("修改物料基本信息")
     @ApiOperation("修改物料基本信息")
@@ -52,6 +68,11 @@ public class MaterialbaseController {
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
 
+    /**
+     * 删除物料基本信息
+     * @param ids
+     * @return
+     */
     @DeleteMapping
     @Log("删除物料基本信息")
     @ApiOperation("删除物料基本信息")
diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/service/MaterialbaseService.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/service/MaterialbaseService.java
index 684e39a..1d5f43d 100644
--- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/service/MaterialbaseService.java
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/service/MaterialbaseService.java
@@ -35,19 +35,48 @@ public interface MaterialbaseService extends CommonService<Materialbase> {
      */
     List<MaterialbaseDto> queryAll(MaterialbaseQueryParam query);
 
+    /**
+     * 根据ID查询
+     *
+     * @param id ID
+     * @return MaterialbaseDto
+     */
     Materialbase getById(String id);
 
+    /**
+     * 根据ID查询
+     *
+     * @param id ID
+     * @return MaterialbaseDto
+     */
     MaterialbaseDto findById(String id);
 
     /**
-     * 插入一条新数据。
+     *  插入一条新数据。
+     * @param resources
+     * @return
      */
     int insert(MaterialbaseDto resources);
 
+    /**
+     * 根据id修改
+     * @param resources
+     * @return
+     */
     int updateById(MaterialbaseDto resources);
 
+    /**
+     * 根据id删除
+     * @param id
+     * @return
+     */
     int removeById(String id);
 
+    /**
+     * 多选删除
+     * @param ids
+     * @return
+     */
     int removeByIds(Set<String> ids);
 
     /**
diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/service/impl/MaterialbaseServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/service/impl/MaterialbaseServiceImpl.java
index b66acd1..fa409bb 100644
--- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/service/impl/MaterialbaseServiceImpl.java
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/service/impl/MaterialbaseServiceImpl.java
@@ -15,10 +15,6 @@ import org.nl.acs.materialbase.service.mapper.MaterialbaseMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-// 默认不使用缓存
-//import org.springframework.cache.annotation.CacheConfig;
-//import org.springframework.cache.annotation.CacheEvict;
-//import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.domain.Pageable;
 
 import java.util.*;