commit code

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

@@ -104,14 +104,17 @@ public class ArchivesTypeController {
     }
 
     @ApiOperation("创建门类字典")
-    @AnonymousPostMapping("createDic")
-    public ApiResponse<Object> createDic(ArchivesDictionaryDTO arcdicDto){
-        if (!StringUtils.isEmpty(arcdicDto.getId())){
+    @AnonymousPostMapping("create-dic")
+    public ApiResponse<Object> createDic(@RequestBody ArchivesDictionaryDTO arcdicDto) {
+        if (!StringUtils.isEmpty(arcdicDto.getId())) {
             throw new BaseException("id添加异常");
         }
-        if (!StringUtils.isEmpty(arcdicDto.getFieldCnName()) || StringUtils.isEmpty(arcdicDto.getFieldName())){
+        if (StringUtils.isEmpty(arcdicDto.getFieldCnName()) || StringUtils.isEmpty(arcdicDto.getFieldName())) {
             throw new BaseException("字段名字不能为空");
         }
+        if (StringUtils.isEmpty(arcdicDto.getIsDataTypeDetails())){
+            throw new BaseException("数据类型不能为空");
+        }
 
         archivesDictionaryService.create(arcdicDto);
         return ApiResponse.success(ResponseStatus.SUCCESS);
@@ -120,7 +123,7 @@ public class ArchivesTypeController {
 
     @ApiOperation("获取档案配置下拉列表")
     @AnonymousGetMapping("arc-config")
-    public ApiResponse<Object> getArcConfig(){
+    public ApiResponse<Object> getArcConfig() {
         return ApiResponse.success(dictionaryService.findDictrionaryMenu());
 
     }

archives/src/main/java/com/storeroom/modules/dictionary/domain/Dictionary.java

@@ -25,9 +25,6 @@ public class Dictionary extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "名称")
     private String dicName;
     
-    @OneToMany(mappedBy = "dictionaryConfigId")
-    private List<ArchivesDictionary> archivesDictionaryList;
-
 
     @Column(name = "dic_code")
     @ApiModelProperty(value = "代码")

archives/src/main/java/com/storeroom/modules/dictionary/repository/ArchivesDictionaryRepository.java

@@ -24,11 +24,21 @@ public interface ArchivesDictionaryRepository extends JpaRepository<ArchivesDict
 
     /**
      * 通过门类id查询
+     *
      * @param categoryId
      * @return
      */
     List<ArchivesDictionary> findByCategoryId(String categoryId);
 
+    /**
+     * 通过名称查询
+     *
+     * @param fcName
+     * @param fName
+     * @return
+     */
+    @Query(value = "select * from archives_dictionary where field_name = ?1 or field_cn_name = ?2",nativeQuery = true)
+    ArchivesDictionary findByName(String fName, String fcName);
 
 
 }

archives/src/main/java/com/storeroom/modules/dictionary/service/dto/ArchivesDictionaryDTO.java

@@ -2,15 +2,14 @@ package com.storeroom.modules.dictionary.service.dto;
 
 
 import com.storeroom.base.BaseDTO;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
+
 
 import java.io.Serializable;
 import java.util.List;
 import java.util.Objects;
 
-@Getter
-@Setter
+@Data
 public class ArchivesDictionaryDTO extends BaseDTO implements Serializable {
 
     private String id;

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

@@ -51,7 +51,7 @@ public class ArchivesDictionaryImpl implements ArchivesDictionaryService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void update(ArchivesDictionaryDTO arcdicDto){
+    public void update(ArchivesDictionaryDTO arcdicDto) {
         ArchivesDictionary dictionary = archivesDictionaryMapper.toEntity(arcdicDto);
 
         ArchivesDictionary dictionary1 = archivesDictionaryRepository.findById(dictionary.getId()).orElseGet(ArchivesDictionary::new);
@@ -92,8 +92,13 @@ public class ArchivesDictionaryImpl implements ArchivesDictionaryService {
 
     @Override
     public void create(ArchivesDictionaryDTO arcdicDto) {
-        arcdicDto.setId(NanoIdUtils.randomNanoId());
-        archivesDictionaryRepository.save(archivesDictionaryMapper.toEntity(arcdicDto));
+        ArchivesDictionary arc = archivesDictionaryMapper.toEntity(arcdicDto);
+        ArchivesDictionary arc1 = archivesDictionaryRepository.findByName(arc.getFieldCnName(), arc.getFieldName());
+        if (arc1==null){
+            arcdicDto.setId(NanoIdUtils.randomNanoId());
+            archivesDictionaryRepository.save(archivesDictionaryMapper.toEntity(arcdicDto));
+        }
+        throw new BaseException("字段名称不能重复");
     }