commit code

archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesTypeController.java

@@ -1,6 +1,7 @@
 package com.storeroom.modules.dictionary.controller;
 
 
+import com.storeroom.annotaion.rest.AnonymousDeleteMapping;
 import com.storeroom.annotaion.rest.AnonymousGetMapping;
 import com.storeroom.annotaion.rest.AnonymousPostMapping;
 import com.storeroom.annotaion.rest.AnonymousPutMapping;
@@ -21,6 +22,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.*;
@@ -67,6 +69,27 @@ public class ArchivesTypeController {
         return ApiResponse.success("保存成功");
     }
 
+    @ApiOperation("修改门类")
+    @AnonymousPutMapping("updata-type")
+    public ApiResponse<Object> updataAchivesType(@RequestBody ArchivesTypeDTO archivesTypeDTO) {
+        if (!StringUtils.isEmpty(archivesTypeDTO.getId())) {
+            archivesTypeService.update(archivesTypeDTO);
+            return ApiResponse.success(ResponseStatus.SUCCESS);
+        }
+        throw new BaseException("id不能为空");
+    }
+
+
+    @ApiOperation("删除门类类型")
+    @AnonymousDeleteMapping("delete-type")
+    public ApiResponse<Object> deleteType(@RequestParam String id) {
+        if (!StringUtils.isEmpty(id)) {
+            archivesTypeService.delete(id);
+            return ApiResponse.success(ResponseStatus.SUCCESS);
+        }
+        throw new BaseException("id不能为空");
+    }
+
     @ApiOperation("获取门类树状菜单")
     @AnonymousGetMapping("menu")
     //TODO:权限未添加
@@ -93,9 +116,9 @@ public class ArchivesTypeController {
         throw new BaseException("id异常");
     }
 
-    @ApiOperation("修改数据")
+    @ApiOperation("修改门类字段")
     @AnonymousPutMapping("update")
-    public ApiResponse<Object> update(@RequestBody ArchivesDictionaryDTO arcdicDto) throws Exception {
+    public ApiResponse<Object> updateDic(@RequestBody ArchivesDictionaryDTO arcdicDto) {
         if (!StringUtils.isEmpty(arcdicDto.getId())) {
             archivesDictionaryService.update(arcdicDto);
             return ApiResponse.success(ResponseStatus.SUCCESS);
@@ -112,7 +135,7 @@ public class ArchivesTypeController {
         if (StringUtils.isEmpty(arcdicDto.getFieldCnName()) || StringUtils.isEmpty(arcdicDto.getFieldName())) {
             throw new BaseException("字段名字不能为空");
         }
-        if (StringUtils.isEmpty(arcdicDto.getIsDataTypeDetails())){
+        if (StringUtils.isEmpty(arcdicDto.getIsDataTypeDetails())) {
             throw new BaseException("数据类型不能为空");
         }
 

archives/src/main/java/com/storeroom/modules/dictionary/service/ArchivesTypeService.java

@@ -23,6 +23,19 @@ public interface ArchivesTypeService {
      */
     List<ArchivesTypeDTO> buildTree();
 
+    /**
+     * 修改门类类型
+     * @param archivesTypeDTO
+     */
+    void update(ArchivesTypeDTO archivesTypeDTO);
+
+
+    /**
+     * 删除门类类型
+     * @param id
+     */
+    void delete(String id);
+
 
 
 

archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesTypeServiceImpl.java

@@ -9,6 +9,7 @@ import com.storeroom.modules.dictionary.service.dto.ArchivesTypeDTO;
 import com.storeroom.modules.dictionary.service.mapstruct.ArchivesTypeMapper;
 import com.storeroom.utils.DateUtils;
 import com.storeroom.utils.NanoIdUtils;
+import com.storeroom.utils.ValidationUtil;
 import lombok.RequiredArgsConstructor;
 
 
@@ -53,7 +54,7 @@ public class ArchivesTypeServiceImpl implements ArchivesTypeService {
     @Override
     public List<ArchivesTypeDTO> buildTree() {
         List<ArchivesType> arcList = archivesTypeRepository.findAll();
-        List<ArchivesTypeDTO> archivesTypeDTOS =  archivesTypeMapper.toDto(arcList);
+        List<ArchivesTypeDTO> archivesTypeDTOS = archivesTypeMapper.toDto(arcList);
         List<ArchivesTypeDTO> trees = new ArrayList<>();
         Set<String> ids = new HashSet<>();
         for (ArchivesTypeDTO archivesTypeDTO : archivesTypeDTOS) {
@@ -76,5 +77,31 @@ public class ArchivesTypeServiceImpl implements ArchivesTypeService {
         return trees;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(ArchivesTypeDTO archivesTypeDTO) {
+        ArchivesType at1 = archivesTypeMapper.toEntity(archivesTypeDTO);
+
+        ArchivesType at2 = archivesTypeRepository.findById(at1.getId()).orElseGet(ArchivesType::new);
+
+        ValidationUtil.isNull(at2.getId(), "ArchivesType", "id", at1.getId());
+
+        at2.setCnName(at1.getCnName());
+        at2.setEnName(at1.getEnName());
+        at2.setPid(at1.getPid());
+        at2.setIsType(at1.getIsType());
+        at2.setIsType(at1.getIsType());
+        at2.setIsTypeMetic(at1.getIsTypeMetic());
+        at2.setCategorySeq(at1.getCategorySeq());
+        at2.setRemark(at1.getRemark());
+        archivesTypeRepository.save(at2);
+
+    }
+
+    @Override
+    public void delete(String id) {
+        archivesTypeRepository.deleteById(id);
+    }
+
 
 }